chatrix 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2375aa13d58ebfd71dd9b5638ece86b117ab7c
-  data.tar.gz: b1af2a00d81f14c65cb431a7e2dd5cda2c64f131
+  metadata.gz: 5fdbaf53540d109264fd47203f5bf8371b7a0e0d
+  data.tar.gz: e618549b57e588e22fe091b3f7538053088a97e3
 SHA512:
-  metadata.gz: d024ab9abac227ab99042caa3a3a30659c892f4f1345d7c304905c59df88c06aaf39ca00557d43863833da8ae4ef68a656ee84bd60e21355358177110b5e1a9a
-  data.tar.gz: 58b18862a142eb30a0c366dbe0a085d4c5a8519129da9615c63c04aa624cfa92ebea37ee421b4264a807ad201598a242f09b11514402ffe9d8180a0f7978fdbe
+  metadata.gz: 2ea913a13a9257f27fdccdf36a4a013360bbc2d0c7c0756978f633152351c33aaa7e9e574ae177e050d438f7d3997db41f5d64f2a726dc43e460c5db60188261
+  data.tar.gz: ccf53b6718e921aa22fc1a6354997155de119baa19a75bb594b8c380e159bfbc7b2a57673e61c48e50645be2badb2d35a26b53cbd1ae1636b6909b3587b09bd2

data/lib/chatrix/client.rb

@@ -34,6 +34,7 @@ module Chatrix
 
       @rooms.on(:added) do |room|
         broadcast(:room_added, room)
+        room.on(:invited) { |s, i| broadcast(:invited, room, s, i) }
         room.timeline.on(:message) { |r, m| broadcast(:room_message, r, m) }
       end
     end
@@ -46,14 +47,28 @@ module Chatrix
     # @see #sync! See the documentation for {#sync!} for more information
     #   and what happens in case of an error during sync.
     def start_syncing
-      @sync_thread ||= Thread.new { loop { sync! } }
+      @sync_thread ||= Thread.new do
+        begin
+          loop { sync! }
+        rescue => e
+          broadcast(:connection_error, e)
+        ensure
+          stop_syncing
+          broadcast(:disconnected)
+        end
+      end
     end
 
     # Stops syncing against the homeserver.
     def stop_syncing
       return unless @sync_thread.is_a? Thread
+
       @sync_thread.exit
       @sync_thread.join
+
+    rescue => e
+      broadcast(:stop_error, e)
+    ensure
       @sync_thread = nil
     end
 
@@ -73,6 +88,13 @@ module Chatrix
       @rooms[id]
     end
 
+    # Joins the room with the specified ID.
+    # @param id [String] The room ID to join.
+    # @return [Room] The Room instance for the joined room.
+    def join_room(id)
+      @rooms.join id
+    end
+
     private
 
     # Syncs against the server.

data/lib/chatrix/components/admin.rb

@@ -30,31 +30,28 @@ module Chatrix
 
       # Kicks a user from the room.
       #
-      # @param user [User,String] The user to kick, can be either a User
-      #   object or a String (user ID).
+      # @param user [User] The user to kick.
       # @param reason [String] The reason for the kick.
       # @return [Boolean] `true` if the user was kicked, otherwise `false`.
       def kick(user, reason)
-        @matrix.rooms.actions.kick @room.id, user, reason
+        @matrix.rooms.actions.kick @room.id, user.id, reason
       end
 
       # Bans a user from the room.
       #
-      # @param user [User,String] The user to kick, can be either a User
-      #   object or a String (user ID).
+      # @param user [User] The user to kick.
       # @param reason [String] The reason for the ban.
       # @return [Boolean] `true` if the user was kicked, otherwise `false`.
       def ban(user, reason)
-        @matrix.rooms.actions.ban @room.id, user, reason
+        @matrix.rooms.actions.ban @room.id, user.id, reason
       end
 
       # Unbans a user from the room.
       #
-      # @param user [User,String] The user to unban, can be either a User
-      #   objec or a String (user ID).
+      # @param user [User] The user to unban.
       # @return [Boolean] `true` if the user was unbanned, otherwise `false`.
       def unban(user)
-        @matrix.rooms.actions.unban @room.id, user
+        @matrix.rooms.actions.unban @room.id, user.id
       end
     end
   end

data/lib/chatrix/rooms.rb

@@ -31,7 +31,7 @@ module Chatrix
       return @rooms[id] if id.start_with? '!'
 
       if id.start_with? '#'
-        res = @rooms.find { |_, r| r.alias == id }
+        res = @rooms.find { |_, r| r.canonical_alias == id }
         return res.last if res.respond_to? :last
       end
 
@@ -39,6 +39,15 @@ module Chatrix
       res.last if res.respond_to? :last
     end
 
+    # Attempts to join the specified room.
+    # @param id [String] The room ID to join.
+    # @return [Room] The Room instance for the joined room.
+    # @raise [ForbiddenError] Raised if the user does not have sufficient
+    #   permissions to join the room.
+    def join(id)
+      get_room(id).tap(&:join)
+    end
+
     # Processes a list of room events from syncs.
     #
     # @param events [Hash] A hash of room events as returned from the server.

data/lib/chatrix/version.rb

@@ -3,5 +3,5 @@
 
 module Chatrix
   # The current version of this gem.
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatrix
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Adam Hellberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty