ticketfrei/ticketfrei3
8
1
Fork 0
Code Issues 11 Pull requests 2 Projects 1 Releases Wiki Activity

[twitter] Move twitter config options to subpoint twitter

Browse source
This commit is contained in:
Cathy Hu 2020-07-08 13:22:53 +02:00 committed by acipm
parent 8af6205146
commit 66684c2fea
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kibicara/platforms/twitter/bot.py
View file

@ -17,13 +17,12 @@ class TwitterBot(Censor):
def __init__(self, twitter_model): def __init__(self, twitter_model):
super().__init__(twitter_model.hood) super().__init__(twitter_model.hood)
self.twitter_model = twitter_model self.twitter_model = twitter_model
self.tokens = { self.client = PeonyClient(
'consumer_key': config['twitter_consumer_key'], consumer_key=config['twitter']['consumer_key'],
'consumer_secret': config['twitter_consumer_secret'], consumer_secret=config['twitter']['consumer_secret'],
'access_token': twitter_model.access_token, access_token=twitter_model.access_token,
'access_token_secret': twitter_model.access_token_secret, access_token_secret=twitter_model.access_token_secret,
} )
self.client = PeonyClient(**self.tokens)
self.polling_interval_sec = 60 self.polling_interval_sec = 60
self.mentions_since_id = self.twitter_model.mentions_since_id self.mentions_since_id = self.twitter_model.mentions_since_id
self.dms_since_id = self.twitter_model.dms_since_id self.dms_since_id = self.twitter_model.dms_since_id

8
kibicara/platforms/twitter/webapi.py
View file

@ -47,8 +47,8 @@ async def twitter_delete(twitter=Depends(get_twitter)):
async def twitter_create(response: Response, hood=Depends(get_hood)): async def twitter_create(response: Response, hood=Depends(get_hood)):
try: try:
request_token = await get_oauth_token( request_token = await get_oauth_token(
config['twitter_consumer_key'], config['twitter']['consumer_key'],
config['twitter_consumer_secret'], config['twitter']['consumer_secret'],
callback_uri='http://127.0.0.1:8000/api/twitter/callback', callback_uri='http://127.0.0.1:8000/api/twitter/callback',
) )
if request_token['oauth_callback_confirmed'] != 'true': if request_token['oauth_callback_confirmed'] != 'true':
@ -69,8 +69,8 @@ async def twitter_read_callback(oauth_token: str, oauth_verifier: str):
try: try:
twitter = await Twitter.objects.filter(access_token=oauth_token).get() twitter = await Twitter.objects.filter(access_token=oauth_token).get()
access_token = await get_access_token( access_token = await get_access_token(
config['twitter_consumer_key'], config['twitter']['consumer_key'],
config['twitter_consumer_secret'], config['twitter']['consumer_secret'],
twitter.access_token, twitter.access_token,
twitter.access_token_secret, twitter.access_token_secret,
oauth_verifier, oauth_verifier,