aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add gif back inRyan Huber2016-08-241-0/+0
|
* Merge pull request #234 from brimstone/fix-new-querysRyan Huber2016-07-151-5/+5
|\ | | | | Open new queries
| * Switched around logic for readabilityMatt Robinson2016-06-171-5/+5
| |
| * Allows new queries to openMatt Robinson2016-06-131-3/+3
| |
* | Sets are not JSON serializableJason Kölker2016-06-291-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 46384b6782f0b73318f764bf02f24cdbcdd059c9 introduced storing the reaction users as a set in the message_json representation. However sets are not JSON serializable. Instead uses a list and checks for membership prior to manipulation. Fixes the traceback: Traceback (most recent call last): File "wee_slack.py", line 2105, in cache_write_cb cache_file.write("{}\n".format(json.dumps(message.message_json))) File "/usr/lib/python2.7/json/__init__.py", line 244, in dumps return _default_encoder.encode(obj) File "/usr/lib/python2.7/json/encoder.py", line 207, in encode chunks = self.iterencode(o, _one_shot=True) File "/usr/lib/python2.7/json/encoder.py", line 270, in iterencode return _iterencode(o, 0) File "/usr/lib/python2.7/json/encoder.py", line 184, in default raise TypeError(repr(o) + " is not JSON serializable") TypeError: set([u'Uxxxxxxxx']) is not JSON serializable
* | Skip set_(in)active if user is deletedJason Kölker2016-06-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents the traceback: Traceback (most recent call last): File "wee_slack.py", line 1361, in slack_websocket_cb proc[function_name](message_json) File "wee_slack.py", line 1417, in process_presence_change server.users.find(identifier).set_active() File "wee_slack.py", line 860, in set_active w.nicklist_nick_set(self.server.buffer, self.nicklist_pointer, "visible", "1") AttributeError: 'User' object has no attribute 'nicklist_pointer'
* | Merge pull request #226 from irconan/group_subtypesRyan Huber2016-06-171-1/+13
|\ \ | | | | | | Added process_group_join, process_group_leave and process_group_topic
| * | Added process_group_join, process_group_leave and process_group_topicRichard Connon2016-05-051-1/+13
| | | | | | | | | | | | that pass to their channel equivalents
* | | Merge pull request #222 from bendem/fix/message-on-server-queryRyan Huber2016-06-171-0/+2
|\ \ \ | | | | | | | | Fix error when sending messages to server query
| * | | Fix error when sending messages to server querybendem2016-04-201-0/+2
| | | |
* | | | Merge pull request #221 from bendem/fix/utf8-topicRyan Huber2016-06-171-1/+1
|\ \ \ \ | | | | | | | | | | Encode topics in utf-8, not ascii
| * | | | Encode topics in utf-8, not asciibendem2016-04-201-1/+1
| |/ / /
* | | | Merge pull request #204 from trygveaa/feat/set-localvar-channel-serverTollef Fog Heen2016-06-171-0/+7
|\ \ \ \ | | | | | | | | | | Set buffer localvars for channel and server
| * | | | Take alias into account for server localvarTrygve Aaberge2016-04-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | If server.alias is set, use that for the server localvar. Otherwise, use server.team.
| * | | | Set server localvar to team nameTrygve Aaberge2016-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of setting the buffer localvar server to the domain ($team.slack.com), set it to only the team name. This makes it more like what the irc plugin sets, which is the server name.
| * | | | Set buffer localvars for channel and serverTrygve Aaberge2016-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the same as what the irc plugin sets, and can be used in the logger masks among other things. This fixes #188.
* | | | | Merge pull request #176 from trygveaa/feature/show-reaction-nicksRyan Huber2016-06-172-30/+43
|\ \ \ \ \ | |_|_|_|/ |/| | | | Show nicks for each reaction
| * | | | Add documentation for config of show_reaction_nicksTrygve Aaberge2016-04-221-0/+5
| | | | |
| * | | | Move config options to optional settings in readmeTrygve Aaberge2016-04-221-15/+15
| | | | |
| * | | | Use a set for storing reaction usersTrygve Aaberge2016-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | A user can only add a specific reaction once per message, so we can store the users in a set instead of a list.
| * | | | Add a config option for showing nicks for reactionsTrygve Aaberge2016-04-221-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some may think it takes up too much space to show all the nicks for all of the reactions. This adds a config option `show_reaction_nicks` for configuring that. If set to false, it only shows the number of persons that added each reaction, like before. If set to true, it shows the new version with each nick. It defaults to false, to not change the behavior.
| * | | | Remove count item from reactionsTrygve Aaberge2016-04-221-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now store and show the users for each reaction, we don't need to store count as well. Each user can only react with a specific reaction to a specific message once, so to get the count we can check the length of the list of users.
| * | | | Show nicks for reactionsTrygve Aaberge2016-04-221-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only showing the number of persons that added a reaction, show the nicks that added them. The nicks are shown comma separated in parenthesis after each reaction. This adds an item named users to the reaction dict of a message, which contains a list of all of the user ids. Since the code assumes that item exists, which makes it incompatible with the old structure, the CACHE_VERSION is increased by one.
* | | | | Merge pull request #229 from adamgibbins/generate_test_tokens_patchTollef Fog Heen2016-05-151-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Update README to mention location of the API token required
| * | | | Update README to mention location of the API token requiredAdam Gibbins2016-05-141-1/+1
|/ / / /
* | | | roll back this change. it breaks some things.Ryan Huber2016-04-221-1/+1
| | | |
* | | | Merge pull request #216 from terminalmage/python-load-exampleTollef Fog Heen2016-04-221-0/+2
|\ \ \ \ | | | | | | | | | | Add info on manually loading wee_slack.py when weechat is already running
| * | | | Add info on manually loading wee_slack.py when weechat is already runningErik Johnson2016-04-121-3/+5
| | |_|/ | |/| | | | | | | | | | Also remove trailing whitespace on a few lines.
* | | | Merge pull request #213 from bendem/fix/check-join-argumentRyan Huber2016-04-221-1/+5
|\ \ \ \ | |_|/ / |/| | | Check that a parameter is passed to /join
| * | | Check that a parameter is passed to /joinbendem2016-04-121-1/+5
| |/ /
* | | Merge pull request #210 from rawdigits/integration-bot-name-printRyan Huber2016-04-221-1/+20
|\ \ \ | | | | | | | | Print out the name of the user when enabling/disabling integrations
| * | | Print out the name of the user when enabling/disabling integrationsTollef Fog Heen2016-04-091-1/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous: pagerduty :] | disabled an integration in this channel: https://… Now: pagerduty :] | foo disabled an integration in this channel: https://…
* | | Merge pull request #208 from trygveaa/prefix-server-buffer-name-with-slackRyan Huber2016-04-221-1/+1
|\ \ \ | | | | | | | | Prefix the server buffer name with slack instead of suffixing it
| * | | Prefix the server buffer name with slack instead of suffixing itTrygve Aaberge2016-04-011-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the format `$team.slack.com` for the server buffer name, change it to `slack.$team`. This makes it easier to see that the buffer is a slack buffer. Additionally, it makes it possible to set options where you specify the start of the buffer name for all of the slack buffers. For example, it makes it possible to set the option `logger.mask.python.slack` for setting a logger file mask for all of the slack buffers.
* | | Merge pull request #205 from rawdigits/bot-for-rtm-apiRyan Huber2016-04-221-3/+8
|\ \ \ | | | | | | | | Handle bots using the RTM API too
| * | | Handle bots using the RTM API tooTollef Fog Heen2016-03-291-3/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | Some bots, such as lita (https://github.com/litaio/lita-slack) is using the RTM API. Those show up as regular users, but have is_bot set on their user object. Pick up on that when formatting lines. Thanks to Whoop on IRC (@adamgibbins) for pointing this out.
* | | Merge pull request #185 from gilbertw1/color-same-prefixRyan Huber2016-04-221-1/+4
|\ \ \ | | | | | | | | Coloring 'prefix_same_nick' prefix the same as the preceding username…
| * | | Coloring 'prefix_same_nick' prefix the same as the preceding username it is ↵Bryan Gilbert2016-03-131-1/+4
| | | | | | | | | | | | | | | | replacing if 'colorize_nicks' is turned on.
* | | | Merge pull request #183 from gilbertw1/colorized-messagesRyan Huber2016-04-222-5/+18
|\ \ \ \ | |_|_|/ |/| | | Added option to colorize messages the same color as the sending nick …
| * | | Added option to colorize messages the same color as the sending nick ↵Bryan Gilbert2016-03-122-5/+18
| |/ / | | | | | | | | | (defaults to off)
* | / Check for channels_not_on_current_server_color existing before removingTollef Fog Heen2016-03-311-1/+2
| |/ |/| | | | | Avoids an error message. Thanks to @torhve for spotting this.
* | Merge pull request #203 from rawdigits/166-more-tagsRyan Huber2016-03-281-6/+8
|\ \ | | | | | | Add more tags to message lines
| * | Add more tags to message linesTollef Fog Heen2016-03-271-6/+8
| |/ | | | | | | | | set nick_$user for all buffer lines, and set log1 for message lines. Fixes: #166
* | Merge pull request #201 from rawdigits/better-attachment-formattingRyan Huber2016-03-281-5/+10
|\ \ | | | | | | Add author_name to attachment formatting
| * | Add author_name to attachment formattingTollef Fog Heen2016-03-271-5/+10
| |/ | | | | | | | | | | | | This should hopefully make some of the trello and other formatting a bit better. Fixes: #145
* | Merge pull request #194 from rawdigits/user-for-server-messagesRyan Huber2016-03-281-2/+4
|\ \ | | | | | | Set the user to "--" for new user and new channel messages
| * | Fix up displayed user name for new user and new channel messagesTollef Fog Heen2016-03-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the value from the config option weechat.look.prefix_network if no user is passed in. Thanks to @bendem for the suggestion to use this rather than a hard coded string. This also fixes a bug where the server buffer was passed as the message and the user was set to "New user joined: foo".
* | | Merge pull request #202 from rawdigits/170-add-licenseRyan Huber2016-03-271-0/+21
|\ \ \ | |/ / |/| | Add LICENSE file (MIT)
| * | Add LICENSE file (MIT)Tollef Fog Heen2016-03-271-0/+21
| |/ | | | | | | Fixes: #170
* | Merge pull request #199 from rawdigits/146_channel_name_issueTollef Fog Heen2016-03-271-1/+1
|\ \ | |/ |/| new channels have # prepended as they should have