Rubbit 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE4NjRhMDAxNGRjMjJlNjNhMmM0ZmVmMzE5YWE3YTM1NzE1ZDdkOA==
+    ZjUyYjZhMTBkMjVkNzU3ZWZkYzk1N2Y5MDFjYzNlNmQxMjRmNTVjYw==
   data.tar.gz: !binary |-
-    YWYxZjg4NGU2ZGIxNWJlMjJkZTgwNmMyNDVmY2RhYTUyZWNkZGYwMg==
+    YmQyYmZlMzM0ZTA2NmE5NDFmNzJmODNhYzUwMDIxMTRjZjFhYmUxZA==
 SHA512:
   metadata.gz: !binary |-
-    ZWE3YjNjYjA3MTQwZThmOGQ0ZTI4OTIwMjQ4ZWEyZjQ2MzY2ZjllMTYwOWY0
-    NGNjM2MwNGZiMGNmOWVmMmM0YTZiMmUzN2Q3OTMwOGVjZDJmMDNjOWIyNGI2
-    NjRmZDIzNTg0NWNjYzY2NWJjNTVmNGY1MGY3OWRjOTI2NDNhMGM=
+    MjEwNjFjYzRhYzE5ODRiNzY5ZWMzZTQwZTdlZmVjOWUwZjJmNTAyNDkyMWYz
+    MWIyYTJkYjQ3NzhmODUyMTVmNTg1ZWQxY2RkYWI1ZDM3ZjdjYTkwMDk4MGJi
+    YmI5YTYyYjkzNGQzYzA5YjU1MzM3YjU0ZDk3Yzc4N2NkNWVjNjU=
   data.tar.gz: !binary |-
-    MTkxNWY1MWZiNGJlMjgxYTgxNDRmYzViNTIyNzEzODJjYTA0Yjc5YzhhZjBh
-    MmRjMmQ0ZDQ1OTE4MzU2MGUzZGIyOWFkNjdkN2QyMWMzMDIwYWNlYjIxMDNh
-    ODI2ODUzODFmMmVkMDFjNjZhMWQ4MjhkOGJiOGQ4MzRhZjYwYzA=
+    NzMwMjFkOTI0MzE1NDZkN2I2MThjNDBlOTI0YTMyNDkyYjkzZTAwOTlhYmVl
+    YTcyODk0MWRiNDY4MGQyMWViOTBhZjI1Yzg0YTVjNGU1MWFhNzcyYWQ2MzU1
+    MTg4YjAwYTViNTQ3MTM5NjRlMjQwOGUyNjYzN2I5MmQ0MTZkNjk=

data/lib/Rubbit.rb

@@ -20,6 +20,10 @@ class Rubbit
 		return @object_builder.build_user(user)
 	end
 
+	def set_request_period(period)
+		@object_builder.set_request_period(period)
+	end
+
 	def login(user=nil,passwd=nil)
 		if(user==nil)
 			print('Enter username: ')
@@ -114,6 +118,10 @@ class Rubbit
 		return @object_builder.build_submission(link)
 	end
 
+	def get_comments(subreddit,limit)
+		return @object_builder.get_comments('http://www.reddit.com/r/'+subreddit+'/comments.json',limit)
+	end
+
 	def get_inbox(limit=100)
 		if(me!=nil)
 			return ContentGenerator.new('http://www.reddit.com/message/inbox.json',limit)
@@ -128,6 +136,14 @@ class Rubbit
 		return nil
 	end
 
+	def friend(user)
+		return @rubbit_poster.friend('friend',user,@me.name)
+	end
+
+	def unfriend(user)
+		return @rubbut_poster.unfriend('friend',user,@me.name)
+	end
+
 	def get_sent(limit=100)
 		if(me!=nil)
 			return ContentGenerator.new('http://www.reddit.com/message/sent.json',limit)

data/lib/Rubbit/Reddit_Net_Wrapper.rb

@@ -10,6 +10,8 @@ class Reddit_Net_Wrapper
 	@first_request = nil
 	@user_agent = nil
 
+	@reset_timer = nil
+
 	@cookie = nil
 
 	@@instance = nil
@@ -25,11 +27,22 @@ class Reddit_Net_Wrapper
 		return @@instance
 	end
 
+	def set_reset_period(period=60)
+		if(period%2!=0 or period>60 or period<2)
+			return false
+		else
+			@reset_timer = period
+			return true
+		end
+
+	end
+
 	def initialize(user)
 		@used = 0
 		@remaining = 30
 		@reset = 60
 		@first_request = 0
+		@reset_timer = 60
 		@user_agent = 'Rubbit/1.0 Ruby RAW by The1RGood USED BY: '
 		@user_agent+=user
 
@@ -39,19 +52,18 @@ class Reddit_Net_Wrapper
 	def make_request(request_type,url,params,redirect=false)
 		uri = URI(url)
 
-		if(@remaining==0)
-			while((Time.now-@first_request).to_i < 60)
-			end
-		end
-
-		if((Time.now - @first_request).to_i > 60)
+		if((Time.now - @first_request).to_i > @reset_timer)
 			@used = 0
-			@remaining = 30
-			@reset = 60
+			@remaining = @reset_timer/2
+			@reset = @reset_timer
 			@first_request = Time.now
 		end
 
 		if(redirect==false)
+			if(@remaining==0)
+				while((Time.now-@first_request).to_i < @reset_timer)
+				end
+			end
 			@used += 1
 			@remaining -= 1
 			@reset = (Time.now - @first_request).to_i

data/lib/Rubbit/Rubbit_Construction_Layer.rb

@@ -22,6 +22,10 @@ class Rubbit_Object_Builder
 		Reddit_Net_Wrapper.instance(net_name)
 	end
 
+	def set_request_period(period)
+		return Reddit_Net_Wrapper.instance.set_reset_period(period)
+	end
+
 	def build_subreddit(display_name)
 		response = Reddit_Net_Wrapper.instance.make_request('get','http://www.reddit.com/r/'+display_name.to_s+"/about.json",{})
 		puts response.code
@@ -67,16 +71,8 @@ class Rubbit_Object_Builder
 		end
 	end
 
-	def get_comments(link)
-		response = Reddit_Net_Wrapper.instance.make_request('get',link.to_s+".json",{})
-		if(response.code=='200')
-			json = JSON.parse(response.body,:max_nesting=>100)
-			return Listing.new(json[1])
-		elsif(response.code=='403')
-			raise PrivateDataException
-		else
-			raise InvalidSubmissionException, "Could not get comment"
-		end
+	def get_comments(link,limit)
+		return ContentGenerator.new(link,limit)
 	end
 
 	private_class_method :new
@@ -231,6 +227,54 @@ class Rubbit_Poster
 		return response.body
 	end
 
+	def friend(type,user,container,info=nil,duration=nil)
+		params = {}
+		params['api_type']='json'
+		params['type']=type
+		params['name']=user
+		params['modhash']=get_modhash
+		case type
+		when 'friend'
+			params['note']=info
+			params['container']=container
+		when 'moderator'
+			params['container']=container
+			params['permissions']=info
+		when 'moderator_invite'
+			params['container']=container
+			params['permissions']=info
+		when 'contributor'
+			params['container']=container
+		when 'banned'
+			params['container']=container
+			params['note']=info
+			params['duration']=duration
+		when 'wikibanned'
+			params['container']=container
+			params['note']=info
+			params['duration']=duration
+		when 'wikicontributor'
+			params['container']=container
+		end
+
+		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/friend',params)
+
+		return response.body
+	end
+
+	def unfriend(type,user,container)
+		params = {}
+		params['api_type']='json'
+		params['type']=type
+		params['name']=user
+		params['modhash']=get_modhash
+		params['container']=container
+
+		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/unfriend',params)
+
+		return response.body
+	end
+
 	def get_modhash
 		response = Reddit_Net_Wrapper.instance.make_request('get','http://www.reddit.com/user/'+@logged_in_user+'/about.json',{})
 		data = JSON.parse(response.body)

data/lib/Rubbit/Rubbit_Objects.rb

@@ -55,6 +55,34 @@ class Subreddit
 	def get_banned(limit=100)
 		return ContentGenerator.new('http://www.reddit.com/r/'+@display_name.to_s+'/about/banned.json',limit)
 	end
+
+	def get_moderators(limit=100)
+		return ContentGenerator.new('http://www.reddit.com/r/'+@display_name.to_s+'/about/moderators.json',limit)
+	end
+
+	def add_moderator(name,permissions)
+		return Rubbit_Poster.instance.friend('moderator_invite',name,@display_name,permissions)
+	end
+
+	def add_contributor(name)
+		return Rubbit_Poster.instance.friend('contributor',name,@display_name)
+	end
+
+	def ban(name,note,duration)
+		return Rubbit_Poster.instance.friend('banned',name,@display_name,note,duration)
+	end
+
+	def remove_moderator(name)
+		return Rubbit_Poster.instance.unfriend('moderator',name,@display_name)
+	end
+
+	def remove_contributor(name)
+		return Rubbit_Poster.instance.unfriend('contributor',name,@display_name)
+	end
+
+	def unban(name)
+		return Rubbit_Poster.instance.unfriend('ban',name,@display_name)
+	end
 end
 
 class Redditor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Rubbit
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - /u/The1RGood