Changeset 12f500f for protocols/skype/t

Timestamp:

2013-02-21T13:16:26Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

06eef80

Parents:

e4f5ca8 (diff), 9754c2f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos. Mostly Skype stuff and further deprecating a nogaim
function.

Location:

protocols/skype/t

Files:

• add-yes-bitlbee.mock (modified) (1 diff)
• add-yes-skyped.mock (modified) (1 diff)
• added-no-bitlbee.mock (moved) (moved from protocols/skype/t/add-no-bitlbee.mock)
• added-no-skyped.mock (moved) (moved from protocols/skype/t/add-no-skyped.mock)
• added-yes-bitlbee.mock (added)
• added-yes-skyped.mock (added)
• ctcp-help-bitlbee.mock (added)
• ctcp-help-skyped.mock (added)
• set-mood-text-bitlbee.mock (added)
• set-mood-text-skyped.mock (added)

protocols/skype/t/add-yes-bitlbee.mock

@@ -5 +5 @@
 << PRIVMSG &bitlbee :account add skype alice foo
 << PRIVMSG &bitlbee :account skype on
->> PRIVMSG &bitlbee :skype - New request: The user bob wants to add you
-<< PRIVMSG &bitlbee :yes
+<< PRIVMSG &bitlbee :add skype bob
 >> :bob!bob@skype.com JOIN :&bitlbee

protocols/skype/t/add-yes-skyped.mock

@@ -9 +9 @@
 >> GET USER echo123 ONLINESTATUS
 << USER echo123 ONLINESTATUS ONLINE
-<< USER bob RECEIVEDAUTHREQUEST Please allow me to see when you are online
->> SET USER bob ISAUTHORIZED TRUE
-<< USER bob ISAUTHORIZED TRUE
-<< USER bob RECEIVEDAUTHREQUEST 
+>> SET USER bob BUDDYSTATUS 2 Please authorize me
+<< USER bob BUDDYSTATUS 2
 << USER bob ISAUTHORIZED TRUE
 << USER bob ISBLOCKED FALSE
+<< USER bob BUDDYSTATUS 2
+<< USER bob ONLINESTATUS OFFLINE
+<< USER bob FULLNAME skype test203
 << USER bob BUDDYSTATUS 3
 << USER bob ONLINESTATUS OFFLINE
 << USER bob ONLINESTATUS ONLINE
 << USER bob TIMEZONE 90000
-<< USER bob FULLNAME Miklos V
-<< USER bob LANGUAGE hu Hungarian
-<< USER bob COUNTRY hu Hungary