paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update style of client strings.

Browse Source 
(imported from commit 1516461cf53b2715de68e01f16bb8a8cc33c48ad)
This commit is contained in:
Luke Faraone
2013-12-06 17:50:55 -05:00
parent 663d7483f2
commit 1b5c1ac021
22 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/README.md
View File

@@ -49,7 +49,7 @@ At the top of the file:
# Make sure the Zulip API distribution's root directory is in sys.path, then:
import zulip
zulip_client = zulip.Client(email="your-bot@example.com")
zulip_client = zulip.Client(email="your-bot@example.com", client="MyTestClient/0.1")
When you want to send a message:

2
api/integrations/asana/zulip_asana_mirror
View File

@@ -48,7 +48,7 @@ else:
logging.basicConfig(level=logging.INFO)
client = zulip.Client(email=config.ZULIP_USER, api_key=config.ZULIP_API_KEY,
site=config.ZULIP_SITE, client="asana " + VERSION)
site=config.ZULIP_SITE, client="ZulipAsana/" + VERSION)
def fetch_from_asana(path):
"""

2
api/integrations/basecamp/zulip_basecamp_mirror
View File

@@ -48,7 +48,7 @@ client = zulip.Client(
email=config.ZULIP_USER,
site=config.ZULIP_SITE,
api_key=config.ZULIP_API_KEY,
client="basecamp " + VERSION)
client="ZulipBasecamp/" + VERSION)
user_agent = "Basecamp To Zulip Mirroring script (support@zulip.com)"
htmlParser = HTMLParser()

2
api/integrations/codebase/zulip_codebase_mirror
View File

@@ -51,7 +51,7 @@ client = zulip.Client(
email=config.ZULIP_USER,
site=config.ZULIP_SITE,
api_key=config.ZULIP_API_KEY,
client="codebase " + VERSION)
client="ZulipCodebase/" + VERSION)
user_agent = "Codebase To Zulip Mirroring script (support@zulip.com)"
# find some form of JSON loader/dumper, with a preference order for speed.

2
api/integrations/git/post-receive
View File

@@ -46,7 +46,7 @@ client = zulip.Client(
email=config.ZULIP_USER,
site=config.ZULIP_SITE,
api_key=config.ZULIP_API_KEY,
client="git " + VERSION)
client="ZulipGit/" + VERSION)
# check_output is backported from subprocess.py in Python 2.7
def check_output(*popenargs, **kwargs):

2
api/integrations/hg/zulip-changegroup.py
View File

@@ -87,7 +87,7 @@ def send_zulip(email, api_key, site, stream, subject, content):
"""
client = zulip.Client(email=email, api_key=api_key,
site=site,
client="mercurial " + VERSION)
client="ZulipMercurial/" + VERSION)
message_data = {
"type": "stream",

2
api/integrations/nagios/nagios-notify-zulip
View File

@@ -15,7 +15,7 @@ for opt in ('type', 'host', 'service', 'state'):
parser.add_option('--' + opt)
(opts, args) = parser.parse_args()
client = zulip.Client(config_file=opts.config, client="nagios " + VERSION)
client = zulip.Client(config_file=opts.config, client="ZulipNagios/" + VERSION)
msg = dict(type='stream', to=opts.stream)

3
api/integrations/perforce/zulip_change-commit.py
View File

@@ -52,7 +52,8 @@ import zulip
client = zulip.Client(
email=config.ZULIP_USER,
site=config.ZULIP_SITE,
api_key=config.ZULIP_API_KEY)
api_key=config.ZULIP_API_KEY,
client="ZulipPerforce/" + __version__)
try:
changelist = int(sys.argv[1])

2
api/integrations/rss/rss-bot
View File

@@ -164,7 +164,7 @@ except IOError:
log_error_and_exit("Unable to read feed file at %s." % (opts.feed_file,))
client = zulip.Client(email=opts.email, api_key=opts.api_key,
site=opts.site, client="rss " + VERSION)
site=opts.site, client="ZulipRSS/" + VERSION)
first_message = True

2
api/integrations/svn/post-commit
View File

@@ -46,7 +46,7 @@ client = zulip.Client(
email=config.ZULIP_USER,
site=config.ZULIP_SITE,
api_key=config.ZULIP_API_KEY,
client="svn " + VERSION)
client="ZulipSVN/" + VERSION)
svn = pysvn.Client()
path, rev = sys.argv[1:]

2
api/integrations/trac/zulip_trac.py
View File

@@ -50,7 +50,7 @@ client = zulip.Client(
email=config.ZULIP_USER,
site=config.ZULIP_SITE,
api_key=config.ZULIP_API_KEY,
client="trac " + VERSION)
client="ZulipTrac/" + VERSION)
def markdown_ticket_url(ticket, heading="ticket"):
return "[%s #%s](%s/%s)" % (heading, ticket.id, config.TRAC_BASE_TICKET_URL, ticket.id)

2
api/integrations/twitter/twitter-bot
View File

@@ -129,7 +129,7 @@ client = zulip.Client(
email=options.email,
api_key=options.api_key,
site=options.site,
client="twitter " + VERSION,
client="ZulipTwitter/" + VERSION,
verbose=True)
if since_id < 0 or options.twitter_id != user_id:

2
api/integrations/twitter/twitter-search-bot
View File

@@ -146,7 +146,7 @@ client = zulip.Client(
email=opts.email,
api_key=opts.api_key,
site=opts.site,
client="twitter search " + VERSION,
client="ZulipTwitterSearch/" + VERSION,
verbose=True)
search_query = " OR ".join(opts.search_terms.split(","))

2
bots/check-mirroring
View File

@@ -43,7 +43,7 @@ zulip_client = zulip.Client(
email=zulip_user,
api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
verbose=True,
client="test: Zulip monitoring",
client="ZulipMonitoring/0.1",
site=options.site)
# Configure logging

2
bots/sync-public-streams
View File

@@ -10,7 +10,7 @@ import unicodedata
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'api'))
import zulip
zulip_client = zulip.Client()
zulip_client = zulip.Client(client="ZulipSyncPublicStreamsBot/0.1")
def fetch_public_streams():
public_streams = set()

1
bots/tddium-notify-humbug
View File

@@ -49,6 +49,7 @@ sys.path.append(zulip_directory)
import zulip
client = zulip.Client(
client = "ZulipTddiumNotifier/0.1",
email = os.environ['ZULIP_USER'],
api_key = os.environ.get('ZULIP_API_KEY'))

4
puppet/zulip_internal/files/nagios_plugins/check_send_receive_time
View File

@@ -108,14 +108,14 @@ zulip_sender = zulip.Client(
email=sender.email,
api_key=sender.api_key,
verbose=True,
client="test: Zulip monitoring",
client="ZulipMonitoring/0.1",
site=site)
zulip_recipient = zulip.Client(
email=recipient.email,
api_key=recipient.api_key,
verbose=True,
client="test: Zulip monitoring",
client="ZulipMonitoring/0.1",
site=site)
try:

1
tools/inject-messages/inject-messages
View File

@@ -35,6 +35,7 @@ next_user = gen_next_user()
def connect_all(users):
for user in users:
users[user]['client'] = zulip.Client(
client="ZulipMessageInjector/0.1",
email=user + '@zulip.com',
api_key=users[user]['api-key'],
site=options.site,

2
tools/review
View File

@@ -388,7 +388,7 @@ def main(args):
return 2
if not opts.stdout:
client = zulip.Client(verbose=True)
client = zulip.Client(verbose=True, client="ZulipReview/0.1")
if 'staging' not in client.base_url:
print '''

2
tools/send_github_payloads.py
View File

@@ -6,7 +6,7 @@ import simplejson
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'api'))
import zulip
zulip_client = zulip.Client(site="http://localhost:9991")
zulip_client = zulip.Client(site="http://localhost:9991", client="ZulipGithubPayloadSender/0.1")
payload_dir = "zerver/fixtures/github"
for filename in os.listdir(payload_dir):

3
zerver/management/commands/email-mirror.py
View File

@@ -61,17 +61,20 @@ except UserProfile.DoesNotExist:
if settings.DEPLOYED:
prod_api_client = zulip.Client(
client="ZulipEmailMirror/0.1",
site="https://zulip.com",
email=settings.EMAIL_GATEWAY_BOT,
api_key=api_key)
api_client = zulip.Client(
client="ZulipEmailMirror/0.1",
site=settings.EXTERNAL_API_URI,
email=settings.EMAIL_GATEWAY_BOT,
api_key=api_key)
else:
api_client = prod_api_client = zulip.Client(
client="ZulipEmailMirror/0.1",
site=settings.EXTERNAL_API_URI,
email=settings.EMAIL_GATEWAY_BOT,
api_key=api_key)

1
zerver/worker/queue_processors.py
View File

@@ -183,6 +183,7 @@ def make_feedback_client():
sys.path.append(os.path.join(os.path.dirname(__file__), '../../api'))
import zulip
return zulip.Client(
client="ZulipFeedback/0.1",
email=settings.DEPLOYMENT_ROLE_NAME,
api_key=settings.DEPLOYMENT_ROLE_KEY,
verbose=True,