synacrb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b804a81c7a3b8bab7a38706572dc0fd24deccd8f
-  data.tar.gz: 1ea9553f4eecdb3fec32238421cd7be7a8f9d0f3
+  metadata.gz: fb153533096ac14331d01c6e84d065b07cdd6c4e
+  data.tar.gz: a4cf5df045fd3430208a0b8c7bf1087ca365ab52
 SHA512:
-  metadata.gz: e4dd2dc9beec7421a801facffcff1ad87bf3708123584c974336ac44e080cb9de626d8e83c2e4d31d3d3028cb89a9b81c7cba3e6a2c1b6bdc29145d803ab4963
-  data.tar.gz: d30008e3e3210856ae7a88e8f3c70bf2db87e1418f09a84ad08cefa32090b335254fefcf020dd7cd5280b1b88ce5e20d65a481b8285509d6430871c2ace6edc3
+  metadata.gz: 256dec217b8b609d41141a3226ba9c9bc43ef60c8c440b8a494903737c1967e03322a6d99a2dd470f1c44e3bab4eb13ec79364e589873c637beb7d3326456d53
+  data.tar.gz: 7f03ec68e9186ab0ff41966768f63be1768ee64c3caf0151e426c0a7ad0dd7a1486ec0de0ab90d0c22ae2b3db051638d9b12645fb6ea4981e62a920ef65d3383

data/lib/synacrb/common.rb

@@ -10,18 +10,19 @@ module Synacrb
 
         LIMIT_BULK = 64
 
-        ERR_LIMIT_REACHED      = 1
-        ERR_LOGIN_BANNED       = 2
-        ERR_LOGIN_BOT          = 3
-        ERR_LOGIN_INVALID      = 4
-        ERR_MAX_CONN_PER_IP    = 5
-        ERR_MISSING_FIELD      = 6
-        ERR_MISSING_PERMISSION = 7
-        ERR_NAME_TAKEN         = 8
-        ERR_UNKNOWN_BOT        = 9
-        ERR_UNKNOWN_CHANNEL    = 10
-        ERR_UNKNOWN_MESSAGE    = 11
-        ERR_UNKNOWN_USER       = 12
+        ERR_ALREADY_EXISTS     = 1
+        ERR_LIMIT_REACHED      = 2
+        ERR_LOGIN_BANNED       = 3
+        ERR_LOGIN_BOT          = 4
+        ERR_LOGIN_INVALID      = 5
+        ERR_MAX_CONN_PER_IP    = 6
+        ERR_MISSING_FIELD      = 7
+        ERR_MISSING_PERMISSION = 8
+        ERR_SELF_PM            = 9
+        ERR_UNKNOWN_BOT        = 10
+        ERR_UNKNOWN_CHANNEL    = 11
+        ERR_UNKNOWN_MESSAGE    = 12
+        ERR_UNKNOWN_USER       = 13
 
         PERM_READ              = 1
         PERM_WRITE             = 1 << 1
@@ -32,7 +33,7 @@ module Synacrb
 
         PERM_ALL = PERM_READ | PERM_WRITE | PERM_MANAGE_CHANNELS | PERM_MANAGE_MESSAGES | PERM_MANAGE_MODES;
 
-        Channel = Struct.new(:default_mode_bot, :default_mode_user, :id, :name)
+        Channel = Struct.new(:default_mode_bot, :default_mode_user, :id, :name, :private)
         Message = Struct.new(:author, :channel, :id, :text, :timestamp, :timestamp_edit)
         User = Struct.new(:admin, :ban, :bot, :id, :modes, :name)
 
@@ -40,7 +41,7 @@ module Synacrb
         PACKET_CLOSE_ID             = 0;  Close = Class.new
         PACKET_ERR_ID               = 1;
         PACKET_RATELIMIT_ID         = 2;
-        PACKET_CHANNELCREATE_ID     = 3;  ChannelCreate = Struct.new(:default_mode_bot, :default_mode_user, :name)
+        PACKET_CHANNELCREATE_ID     = 3;  ChannelCreate = Struct.new(:default_mode_bot, :default_mode_user, :name, :recipient)
         PACKET_CHANNELDELETE_ID     = 4;  ChannelDelete = Struct.new(:id)
         PACKET_CHANNELUPDATE_ID     = 5;  ChannelUpdate = Struct.new(:inner)
         PACKET_COMMAND_ID           = 6;  Command = Struct.new(:args, :recipient)
@@ -51,20 +52,19 @@ module Synacrb
         PACKET_MESSAGEDELETEBULK_ID = 11; MessageDeleteBulk = Struct.new(:channel, :ids)
         PACKET_MESSAGELIST_ID       = 12; MessageList = Struct.new(:after, :before, :channel, :limit)
         PACKET_MESSAGEUPDATE_ID     = 13; MessageUpdate = Struct.new(:id, :text)
-        PACKET_PRIVATEMESSAGE_ID    = 14; PrivateMessage = Struct.new(:text, :recipient)
-        PACKET_TYPING_ID            = 15; Typing = Struct.new(:channel)
-        PACKET_USERUPDATE_ID        = 16; UserUpdate = Struct.new(:admin, :ban, :channel_mode, :id)
+        PACKET_TYPING_ID            = 14; Typing = Struct.new(:channel)
+        PACKET_USERUPDATE_ID        = 15; UserUpdate = Struct.new(:admin, :ban, :channel_mode, :id)
 
         # SERVER PACKETS
-        PACKET_CHANNELDELETERECEIVE_ID = 17; ChannelDeleteReceive = Struct.new(:inner)
-        PACKET_CHANNELRECEIVE_ID       = 18; ChannelReceive = Struct.new(:inner)
-        PACKET_COMMANDRECEIVE_ID       = 19; CommandReceive = Struct.new(:args, :author)
-        PACKET_LOGINSUCCESS_ID         = 20; LoginSuccess = Struct.new(:created, :id, :token)
-        PACKET_MESSAGEDELETERECEIVE_ID = 21; MessageDeleteReceive = Struct.new(:id)
+        PACKET_CHANNELDELETERECEIVE_ID = 16; ChannelDeleteReceive = Struct.new(:inner)
+        PACKET_CHANNELRECEIVE_ID       = 17; ChannelReceive = Struct.new(:inner)
+        PACKET_COMMANDRECEIVE_ID       = 18; CommandReceive = Struct.new(:args, :author)
+        PACKET_LOGINSUCCESS_ID         = 19; LoginSuccess = Struct.new(:created, :id, :token)
+        PACKET_MESSAGEDELETERECEIVE_ID = 20; MessageDeleteReceive = Struct.new(:id)
+        PACKET_MESSAGELISTRECEIVED_ID  = 21; MessageListReceived = Struct.new(:id)
         PACKET_MESSAGERECEIVE_ID       = 22; MessageReceive = Struct.new(:inner, :new)
-        PACKET_PMRECEIVE_ID            = 23; PMReceive = Struct.new(:author, :text)
-        PACKET_TYPINGRECEIVE_ID        = 24; TypingReceive = Struct.new(:author, :channel)
-        PACKET_USERRECEIVE_ID          = 25; UserReceive = Struct.new(:inner)
+        PACKET_TYPINGRECEIVE_ID        = 23; TypingReceive = Struct.new(:author, :channel)
+        PACKET_USERRECEIVE_ID          = 24; UserReceive = Struct.new(:inner)
 
         def self.encode_u16(input)
             (input >> 8).chr + (input % 256).chr
@@ -99,8 +99,6 @@ module Synacrb
                 MessageList
             when PACKET_MESSAGEUPDATE_ID
                 MessageUpdate
-            when PACKET_PRIVATEMESSAGE_ID
-                PrivateMessage
             when PACKET_TYPING_ID
                 Typing
             when PACKET_USERUPDATE_ID
@@ -115,10 +113,10 @@ module Synacrb
                 LoginSuccess
             when PACKET_MESSAGEDELETERECEIVE_ID
                 MessageDeleteReceive
+            when PACKET_MESSAGELISTRECEIVED_ID
+                MessageListReceived
             when PACKET_MESSAGERECEIVE_ID
                 MessageReceive
-            when PACKET_PMRECEIVE_ID
-                PMReceive
             when PACKET_TYPINGRECEIVE_ID
                 TypingReceive
             when PACKET_USERRECEIVE_ID
@@ -166,6 +164,8 @@ module Synacrb
                 PACKET_LOGINSUCCESS_ID
             elsif packet.instance_of? MessageDeleteReceive
                 PACKET_MESSAGEDELETERECEIVE_ID
+            elsif packet.instance_of? MessageListReceived
+                PACKET_MESSAGELISTRECEIVED_ID
             elsif packet.instance_of? MessageReceive
                 PACKET_MESSAGERECEIVE_ID
             elsif packet.instance_of? PMReceive

data/lib/synacrb/state.rb

@@ -28,5 +28,32 @@ module Synacrb
                 @users[packet.inner.id] = packet.inner
             end
         end
+
+        # Search for a private channel with user
+        def get_private_channel(user)
+            @users.keys
+                .map { |channel| @channels[channel] }
+                .compact
+                .find { |channel| channel.private }
+            # the server doesn't send PMs you don't have access to
+        end
+
+        # Search for the recipient in a private channel
+        def get_recipient(channel)
+            if channel.private
+                return nil
+            end
+            get_recipient_unchecked channel.id
+        end
+
+        # Search for the recipient in a private channel.
+        # If the channel isn't private, it returns the first user it can find
+        # that has a special mode in that channel.
+        # So you should probably make sure it's private first.
+        def get_recipient_unchecked(channel_id)
+            @users.values
+                .find { |user| user.modes.keys
+                    .any { |channel| channel == channel_id }}
+        end
     end
 end

data/lib/synacrb/version.rb

@@ -1,3 +1,3 @@
 module Synacrb
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/synacrb.rb

@@ -1,10 +1,10 @@
-require "common.rb"
-require "encrypter.rb"
-require "state.rb"
-
 require "msgpack"
 require "openssl"
 require "socket"
+
+require "synacrb/common"
+require "synacrb/encrypter"
+require "synacrb/state"
 require "synacrb/version"
 
 module Synacrb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synacrb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - jD91mZM2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack