lib/github_cli/commands/notifications.rb in github_cli-0.5.9 vs lib/github_cli/commands/notifications.rb in github_cli-0.6.0

@@ -20,42 +20,48 @@
         all - Optional boolean - true to show notifications marked as read.\n
         participating - Optional boolean - true to show only notifications in which the user is directly participating or mentioned.\n
         since - Optional time - filters out any notifications updated before the given time.\n
     DESC
     def list
+      global_options = options.dup
       params = options[:params].dup
       params['user'] = options[:user] if options[:user]
       params['repo'] = options[:repo] if options[:repo]
-
-      Notification.all params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Notification.all params, global_options
     end
 
     desc 'get <id>', 'View a single thread'
     def get(id)
-      Notification.get id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Notification.get id, params, global_options
     end
 
     option :user, :type => :string, :aliases => ["-u"]
     option :repo, :type => :string, :aliases => ["-r"]
     option :read, :type => :boolean
     option :id, :type => :numeric, :desc => "thread id to be marked"
     desc 'mark', 'Mark as read'
     def mark
+      global_options = options.dup
       params = options[:params].dup
       params['user']      = options[:user] if options[:user]
       params['repo']      = options[:repo] if options[:repo]
       params['read']      = options[:read] if options[:read]
       params['thread_id'] = options[:id]   if options[:id]
-
-      Notification.mark params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params', 'id'])
+      Notification.mark params, global_options
     end
 
     desc 'check', 'Check to see if the current user is subscribed to a thread'
     def check(id)
+      global_options = options.dup
       params = options[:params].dup
-
-      Notification.subscribed? id, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Notification.subscribed? id, params, global_options
     end
 
     option :subscribed, :type => :boolean,
            :desc => 'determines if notifications should be received from this thread'
     option :ignored, :type => :boolean,
@@ -65,21 +71,23 @@
       This lets you subscribe to a thread, or ignore it. Subscribing to a thread
       is unnecessary if the user is already subscribed to the repository. Ignoring
       a thread will mute all future notifications (until you comment or get @mentioned).
     DESC
     def create(id)
+      global_options = options.dup
       params = options[:params].dup
       params['subscribed'] = options[:subscribed] if options[:subscrirbed]
       params['ignored']    = options[:ignored]    if options[:ignored]
-
-      Notification.create id, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Notification.create id, params, global_options
     end
 
     desc 'delete', 'Delete a thread subscription'
     def delete(id)
+      global_options = options.dup
       params = options[:params].dup
-
-      Notification.delete id, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Notification.delete id, params, global_options
     end
 
   end # Notifications
 end # GithubCLI