osm-edit conversation could work using a command entry point.

tryed using the oauth.

Author: Jonathan Koehler

bot.py

@@ -1,6 +1,6 @@
 import os
 import logging
-
+import bot_osm_edit
 import ee_osmose
 import osmose
 from telegram import *
@@ -156,13 +156,15 @@ def main():
     # Get the dispatcher to register handlers
     dp = updater.dispatcher
 
+    editor = bot_osm_edit.ElemEditor()
     # on different commands - answer in Telegram
     dp.add_handler(CommandHandler("start", start))
     dp.add_handler(CommandHandler("help", help))
     dp.add_handler(CommandHandler('user', user_issue))
     dp.add_handler(CallbackQueryHandler(button))
     dp.add_handler(MessageHandler(Filters.location, loc_issue))
     dp.add_handler(CommandHandler("loc", loc_issue))
+    dp.add_handler(editor.get_conversation())
 
     # on non-command i.e message - echo the message on Telegram
     # dp.add_handler(MessageHandler(Filters.text, echo))

bot_osm_edit.py

@@ -13,15 +13,14 @@
 
 class ElemEditor:
     def __init__(self):
-
-        return self.get_conversation()
+        pass
 
     def get_conversation(self):
         return ConversationHandler(
             entry_points=[CommandHandler('_edit', self.start)],
 
             states={
-                 CHOOSING: [MessageHandler(Filters.regex('Tag'), self.tag),
+                 CHOOSING: [MessageHandler(Filters.regex('tag'), self.tag),
                             MessageHandler(Filters.regex('cancel'), self.cancel)
                             ],
 
@@ -35,11 +34,13 @@ def get_conversation(self):
             fallbacks=[MessageHandler(Filters.regex('^Done$'), self.cancel)]
                                    )
 
-    def start(self):
-        pass
+    def start(self, update, context):
+        print('hello here conversation start')
+        return CHOOSING
 
-    def tag(self):
-        pass
+    def tag(self, update, context):
+        print('hay here is converseation Tag')
+        return CHOOSING
 
     def value(self):
         pass

o_auth.py

@@ -37,12 +37,13 @@ def request_token(self):
         self.owner_secret = fetch_response.get('oauth_token_secret')
         return self.owner_key, self.owner_secret
 
-    # Using OAuth1Session
-    def authorize(self):
+    def prepare_auth_url(self):
         authorization_url = self.oauth.authorization_url(self.base_authorization_url)
         print('Please go here and authorize,', authorization_url)  # TODO send this message to user
-        redirect_response = 'raw_input("Paste the full redirect URL here: ")'  # TODO create socket for redirect
-        oauth_response = self.oauth.parse_authorization_response(redirect_response)
+
+    # Using OAuth1Session
+    def authorize(self, response):
+        oauth_response = self.oauth.parse_authorization_response(response)
         logger.debug(oauth_response)
         self.verifier = oauth_response.get('oauth_verifier')
         return self.verifier
@@ -54,5 +55,5 @@ def access_token(self):
                                    resource_owner_key=self.owner_key,
                                    resource_owner_secret=self.owner_secret,
                                    verifier=self.verifier)
-        oauth_tokens = self.oauth.fetch_access_token(self.acc_token_url)
+        oauth_tokens = self.oauth.fetch_access_token(self.access_token_url)
 

test/test_o_auth.py

@@ -0,0 +1,20 @@
+import unittest
+import o_auth
+import requests
+
+class MyTestCase(unittest.TestCase):
+    auth = o_auth.Authorisation()
+
+    def test_something(self):
+        owner_cr = self.auth.request_token()
+        self.auth.prepare_auth_url()
+
+    def test_something(self):
+        self.auth.authorize()
+
+
+
+
+
+if __name__ == '__main__':
+    unittest.main()

test/test_osm_api.py

@@ -95,7 +95,8 @@ def test_close_note(self):
 
     def test_edit_elem(self):
         node = self.osmo.get_element('node', 4314858041)
-        data = self.osmo.edit_element(node, 177967)
+        data = self.osmo.edit_element(node, 178488)
+        print(data)
 
     def test_get_users(self):
         users = self.osmo.get_users([7634, 7122])