synacrb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30dbae35dd723e6b899621986b3a0399393cd8c9
-  data.tar.gz: ffcffa2fdbd971f00a753b2b0b58ee5a22d23557
+  metadata.gz: b804a81c7a3b8bab7a38706572dc0fd24deccd8f
+  data.tar.gz: 1ea9553f4eecdb3fec32238421cd7be7a8f9d0f3
 SHA512:
-  metadata.gz: 55186b9bd1332c6803c7ab07038a11e5fc74107ef6283895545266d533b87e73ff5587147f6178cb58f99adc94f860bc81fa8599abc053c16f81236b940e4491
-  data.tar.gz: ea49876c0be8dbf2d13d1d6c4b080474ab2e14378aa4bebecbf1f23ba0f2fad91057f39839a81731bf08ba5e4a22a3099a7b464b30294b5404eca3970614056b
+  metadata.gz: e4dd2dc9beec7421a801facffcff1ad87bf3708123584c974336ac44e080cb9de626d8e83c2e4d31d3d3028cb89a9b81c7cba3e6a2c1b6bdc29145d803ab4963
+  data.tar.gz: d30008e3e3210856ae7a88e8f3c70bf2db87e1418f09a84ad08cefa32090b335254fefcf020dd7cd5280b1b88ce5e20d65a481b8285509d6430871c2ace6edc3

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 synacrb-*.gem
+/lib/test.rb

data/Gemfile

@@ -2,8 +2,5 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-gem "msgpack"
-gem "openssl"
-
 # Specify your gem's dependencies in synacrb.gemspec
 gemspec

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    synacrb (0.1.0)
+    synacrb (0.2.0)
+      msgpack (~> 1.2)
+      openssl (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    msgpack (1.1.0)
-    openssl (2.0.6)
+    msgpack (1.2.0)
+    openssl (2.1.0)
     rake (10.5.0)
 
 PLATFORMS
@@ -15,8 +17,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
-  msgpack
-  openssl
   rake (~> 10.0)
   synacrb!
 

data/lib/{common.rb → synacrb/common.rb}

@@ -6,76 +6,65 @@ module Synacrb
 
         LIMIT_USER_NAME = 128
         LIMIT_CHANNEL_NAME = 128
-        LIMIT_GROUP_NAME = 128
-        LIMIT_GROUP_AMOUNT = 2048
         LIMIT_MESSAGE = 16384
 
         LIMIT_BULK = 64
 
-        ERR_GROUP_INVALID_POS = 1
-        ERR_GROUP_LOCKED_NAME = 2
-        ERR_LIMIT_REACHED = 3
-        ERR_LOGIN_BANNED = 4
-        ERR_LOGIN_BOT = 5
-        ERR_LOGIN_INVALID = 6
-        ERR_MAX_CONN_PER_IP = 7
-        ERR_MISSING_FIELD = 8
-        ERR_MISSING_PERMISSION = 9
-        ERR_NAME_TAKEN = 10
-        ERR_UNKNOWN_BOT = 11
-        ERR_UNKNOWN_CHANNEL = 12
-        ERR_UNKNOWN_GROUP = 13
-        ERR_UNKNOWN_MESSAGE = 14
-        ERR_UNKNOWN_USER = 15
+        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
 
-        PERM_READ = 1
-        PERM_WRITE = 1 << 1
+        PERM_READ              = 1
+        PERM_WRITE             = 1 << 1
 
-        PERM_ASSIGN_GROUPS = 1 << 2
-        PERM_BAN = 1 << 3
-        PERM_MANAGE_CHANNELS = 1 << 4
-        PERM_MANAGE_GROUPS = 1 << 5
-        PERM_MANAGE_MESSAGES = 1 << 6
+        PERM_MANAGE_CHANNELS   = 1 << 2
+        PERM_MANAGE_MESSAGES   = 1 << 3
+        PERM_MANAGE_MODES      = 1 << 4
 
-        Channel = Struct.new(:id, :name, :overrides)
-        Group = Struct.new(:allow, :deny, :id, :name, :pos, :unassignable)
+        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)
         Message = Struct.new(:author, :channel, :id, :text, :timestamp, :timestamp_edit)
-        User = Struct.new(:ban, :bot, :groups, :id, :name)
+        User = Struct.new(:admin, :ban, :bot, :id, :modes, :name)
 
         # CLIENT PACKETS
-        PACKET_CLOSE_ID = 0;              Close = Class.new
-        PACKET_ERR_ID = 1;
-        PACKET_RATELIMIT_ID = 2;
-        PACKET_CHANNELCREATE_ID = 3;      ChannelCreate = Struct.new(:name, :overrides)
-        PACKET_CHANNELDELETE_ID = 4;      ChannelDelete = Struct.new(:id)
-        PACKET_CHANNELUPDATE_ID = 5;      ChannelUpdate = Struct.new(:inner, :keep_overrides)
-        PACKET_COMMAND_ID = 6;            Command = Struct.new(:args, :recipient)
-        PACKET_GROUPCREATE_ID = 7;        GroupCreate = Struct.new(:allow, :deny, :name, :pos, :unassignable)
-        PACKET_GROUPDELETE_ID = 8;        GroupDelete = Struct.new(:id)
-        PACKET_GROUPUPDATE_ID = 9;        GroupUpdate = Struct.new(:inner)
-        PACKET_LOGIN_ID = 10;             Login = Struct.new(:bot, :name, :password, :token)
-        PACKET_LOGINUPDATE_ID = 11;       LoginUpdate = Struct.new(:name, :password_current, :password_new, :reset_token)
-        PACKET_MESSAGECREATE_ID = 12;     MessageCreate = Struct.new(:channel, :text)
-        PACKET_MESSAGEDELETE_ID = 13;     MessageDelete = Struct.new(:id)
-        PACKET_MESSAGEDELETEBULK_ID = 14; MessageDeleteBulk = Struct.new(:channel, :ids)
-        PACKET_MESSAGELIST_ID = 15;       MessageList = Struct.new(:after, :before, :channel, :limit)
-        PACKET_MESSAGEUPDATE_ID = 16;     MessageUpdate = Struct.new(:id, :text)
-        PACKET_PRIVATEMESSAGE_ID = 17;    PrivateMessage = Struct.new(:text, :recipient)
-        PACKET_TYPING_ID = 18;            Typing = Struct.new(:channel)
-        PACKET_USERUPDATE_ID = 19;        UserUpdate = Struct.new(:ban, :groups, :id)
+        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_CHANNELDELETE_ID     = 4;  ChannelDelete = Struct.new(:id)
+        PACKET_CHANNELUPDATE_ID     = 5;  ChannelUpdate = Struct.new(:inner)
+        PACKET_COMMAND_ID           = 6;  Command = Struct.new(:args, :recipient)
+        PACKET_LOGIN_ID             = 7;  Login = Struct.new(:bot, :name, :password, :token)
+        PACKET_LOGINUPDATE_ID       = 8;  LoginUpdate = Struct.new(:name, :password_current, :password_new, :reset_token)
+        PACKET_MESSAGECREATE_ID     = 9;  MessageCreate = Struct.new(:channel, :text)
+        PACKET_MESSAGEDELETE_ID     = 10; MessageDelete = Struct.new(:id)
+        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)
 
         # SERVER PACKETS
-        PACKET_CHANNELDELETERECEIVE_ID = 20; ChannelDeleteReceive = Struct.new(:inner)
-        PACKET_CHANNELRECEIVE_ID = 21;       ChannelReceive = Struct.new(:inner)
-        PACKET_COMMANDRECEIVE_ID = 22;       CommandReceive = Struct.new(:args, :author)
-        PACKET_GROUPDELETERECEIVE_ID = 23;   GroupDeleteReceive = Struct.new(:inner)
-        PACKET_GROUPRECEIVE_ID = 24;         GroupReceive = Struct.new(:inner, :new)
-        PACKET_LOGINSUCCESS_ID = 25;         LoginSuccess = Struct.new(:created, :id, :token)
-        PACKET_MESSAGEDELETERECEIVE_ID = 26; MessageDeleteReceive = Struct.new(:id)
-        PACKET_MESSAGERECEIVE_ID = 27;       MessageReceive = Struct.new(:inner, :new)
-        PACKET_PMRECEIVE_ID = 28;            PMReceive = Struct.new(:author, :text)
-        PACKET_TYPINGRECEIVE_ID = 29;        TypingReceive = Struct.new(:author, :channel)
-        PACKET_USERRECEIVE_ID = 30;          UserReceive = Struct.new(:inner)
+        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_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)
 
         def self.encode_u16(input)
             (input >> 8).chr + (input % 256).chr
@@ -96,12 +85,6 @@ module Synacrb
                 ChannelUpdate
             when PACKET_COMMAND_ID
                 Command
-            when PACKET_GROUPCREATE_ID
-                GroupCreate
-            when PACKET_GROUPDELETE_ID
-                GroupDelete
-            when PACKET_GROUPUPDATE_ID
-                GroupUpdate
             when PACKET_LOGIN_ID
                 Login
             when PACKET_LOGINUPDATE_ID
@@ -128,10 +111,6 @@ module Synacrb
                 ChannelReceive
             when PACKET_COMMANDRECEIVE_ID
                 CommandReceive
-            when PACKET_GROUPDELETERECEIVE_ID
-                GroupDeleteReceive
-            when PACKET_GROUPRECEIVE_ID
-                GroupReceive
             when PACKET_LOGINSUCCESS_ID
                 LoginSuccess
             when PACKET_MESSAGEDELETERECEIVE_ID
@@ -157,12 +136,6 @@ module Synacrb
                 PACKET_CHANNELUPDATE_ID
             elsif packet.instance_of? Command
                 PACKET_COMMAND_ID
-            elsif packet.instance_of? GroupCreate
-                PACKET_GROUPCREATE_ID
-            elsif packet.instance_of? GroupDelete
-                PACKET_GROUPDELETE_ID
-            elsif packet.instance_of? GroupUpdate
-                PACKET_GROUPUPDATE_ID
             elsif packet.instance_of? Login
                 PACKET_LOGIN_ID
             elsif packet.instance_of? LoginUpdate
@@ -189,10 +162,6 @@ module Synacrb
                 PACKET_CHANNELRECEIVE_ID
             elsif packet.instance_of? CommandReceive
                 PACKET_COMMANDRECEIVE_ID
-            elsif packet.instance_of? GroupDeleteReceive
-                PACKET_GROUPDELETERECEIVE_ID
-            elsif packet.instance_of? GroupReceive
-                PACKET_GROUPRECEIVE_ID
             elsif packet.instance_of? LoginSuccess
                 PACKET_LOGINSUCCESS_ID
             elsif packet.instance_of? MessageDeleteReceive

data/lib/synacrb/state.rb

@@ -0,0 +1,32 @@
+module Synacrb
+    class State
+        def initialize
+            @channels = {}
+            @users    = {}
+        end
+        def channels
+            @channels
+        end
+        def users
+            @users
+        end
+        def update(packet)
+            if packet.instance_of? Common::ChannelDeleteReceive
+                unless packet.inner.instance_of? Common::Channel
+                    packet.inner = Common::Channel.new(*packet.inner)
+                end
+                @channels.delete packet.inner.id
+            elsif packet.instance_of? Common::ChannelReceive
+                unless packet.inner.instance_of? Common::Channel
+                    packet.inner = Common::Channel.new(*packet.inner)
+                end
+                @channels[packet.inner.id] = packet.inner
+            elsif packet.instance_of? Common::UserReceive
+                unless packet.inner.instance_of? Common::User
+                    packet.inner = Common::User.new(*packet.inner)
+                end
+                @users[packet.inner.id] = packet.inner
+            end
+        end
+    end
+end

data/lib/synacrb/version.rb

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

data/lib/synacrb.rb

@@ -8,6 +8,17 @@ require "socket"
 require "synacrb/version"
 
 module Synacrb
+    # Get the mode bitmask for a user in a channel
+    def self.get_mode(channel, user)
+        if user.bot
+            return channel.default_mode_bot unless user.modes.include? channel.id
+            user.modes[channel.id]
+        else
+            return channel.default_mode_user unless user.modes.include? channel.id
+            user.modes[channel.id]
+        end
+    end
+
     class Session
         # Connect to the server
         def initialize(addr, hash, &callback)

data/synacrb.gemspec

@@ -28,6 +28,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "msgpack", "~> 1.2"
+  spec.add_runtime_dependency "openssl", "~> 2.1"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: synacrb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - jD91mZM2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,10 +81,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/common.rb
-- lib/encrypter.rb
-- lib/state.rb
 - lib/synacrb.rb
+- lib/synacrb/common.rb
+- lib/synacrb/encrypter.rb
+- lib/synacrb/state.rb
 - lib/synacrb/version.rb
 - synacrb.gemspec
 homepage: https://github.com/jD91mZM2/synacrb
@@ -79,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: synac library for ruby.

data/lib/state.rb

@@ -1,71 +0,0 @@
-module Synacrb
-    class State
-        def initialize
-            @channels = {}
-            @groups   = {}
-            @users    = {}
-        end
-        def channels
-            @channels
-        end
-        def groups
-            @groups
-        end
-        def users
-            @users
-        end
-        def update(packet)
-            if packet.instance_of? Common::ChannelDeleteReceive
-                unless packet.inner.instance_of? Common::Channel
-                    packet.inner = Common::Channel.new(*packet.inner)
-                end
-                @channels.delete packet.inner.id
-            elsif packet.instance_of? Common::ChannelReceive
-                unless packet.inner.instance_of? Common::Channel
-                    packet.inner = Common::Channel.new(*packet.inner)
-                end
-                @channels[packet.inner.id] = packet.inner
-            elsif packet.instance_of? Common::GroupDeleteReceive
-                unless packet.inner.instance_of? Common::Group
-                    packet.inner = Common::Group.new(*packet.inner)
-                end
-                for id in @groups.each_key
-                    if @groups[id].pos > packet.inner.pos
-                        @groups[id].pos -= 1
-                    end
-                end
-                @groups.delete packet.inner.id
-            elsif packet.instance_of? Common::GroupReceive
-                unless packet.inner.instance_of? Common::Group
-                    packet.inner = Common::Group.new(*packet.inner)
-                end
-                if packet.new
-                    unless @groups[packet.inner.id].nil?
-                        pos = @groups[packet.inner.id].pos
-
-                        if packet.inner.pos > pos
-                            for id in @groups.each_key
-                                if @groups[id].pos > pos && @groups[id].pos <= packet.inner.pos
-                                    @groups[id].pos -= 1
-                                end
-                            end
-                        elsif packet.inner.pos < pos
-                            for group in @groups.each_key
-                                if @groups[id].pos >= packet.inner.pos && @groups[id].pos < pos
-                                    @groups[id].pos += 1
-                                end
-                            end
-                        end
-                    else
-                        for group in @groups.each_key
-                            if @groups[id].pos >= packet.inner.pos
-                                @groups[id].pos += 1
-                            end
-                        end
-                    end
-                end
-                @groups[packet.inner.id] = packet.inner
-            end
-        end
-    end
-end