eryn/ubot2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unpin files

Browse source
This commit is contained in:
Eryn Wells 2016-11-19 00:53:01 -05:00
parent a2e4f99eec
commit a446dfdce8
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/lore.py
View file

@ -71,7 +71,7 @@ class Channel(object):
return oldest_pin return oldest_pin
def remove_pin(self, pin): def remove_pin(self, pin):
result = slack.remove_pin(pin) result = slack.remove_pin(pin, self.ident)
return result return result
def save_pin(self, pin): def save_pin(self, pin):

9
service.py
View file

@ -1,6 +1,7 @@
# service.py # service.py
# Eryn Wells <eryn@erynwells.me> # Eryn Wells <eryn@erynwells.me>
import logging
import requests import requests
slack = None slack = None
@ -13,6 +14,7 @@ class SlackService(object):
def __init__(self, token, host): def __init__(self, token, host):
self.token = token self.token = token
self.host = host self.host = host
self.logger = logging.getLogger('service')
def permalink(self, channel, message): def permalink(self, channel, message):
''' '''
@ -43,11 +45,13 @@ class SlackService(object):
json = self.__extract_json(r) json = self.__extract_json(r)
return json['items'] if json else None return json['items'] if json else None
def remove_pin(self, pin): def remove_pin(self, pin, channel):
params = self.__params() params = self.__params()
params['channel'] = channel
if pin['type'] == 'message': if pin['type'] == 'message':
params['channel'] = pin['channel']
params['timestamp'] = pin['message']['ts'] params['timestamp'] = pin['message']['ts']
elif pin['type'] == 'file':
params['file'] = pin['file']['id']
r = requests.get(self.__url('pins.remove'), params=params) r = requests.get(self.__url('pins.remove'), params=params)
json = self.__extract_json(r) json = self.__extract_json(r)
return json is not None return json is not None
@ -77,5 +81,6 @@ class SlackService(object):
return None return None
json = response.json() json = response.json()
if not json['ok']: if not json['ok']:
self.logger.info('Response not okay: %s', json['error'])
return None return None
return json return json