adds an option for supporting unlisted events

aaronpk · Jan 27, 2021 · 85c8558 · 85c8558
1 parent 0da5cb6
commit 85c8558
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 6 deletions.
diff --git a/app/Event.php b/app/Event.php
@@ -32,7 +32,7 @@ class Event extends Model
         'location_name', 'location_address', 'location_locality', 'location_region', 'location_country',
         'latitude', 'longitude', 'timezone', 'status',
         'website', 'tickets_url', 'code_of_conduct_url', 'meeting_url',
-        'description', 'cover_image',
+        'description', 'cover_image', 'unlisted',
     ];
 
     public static function slug_from_name($name) {

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -37,6 +37,8 @@ private function events_query($year=false, $month=false, $day=false, $only_futur
             $events = new Event();
         }
 
+        $events = $events->where('unlisted', 0);
+
         if($only_future)
             $events = $events->orderBy('sort_date');
         else

diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
@@ -96,6 +96,8 @@ public function create_event(Request $request) {
 
         $event->cover_image = request('cover_image');
 
+        $event->unlisted = request('unlisted') ?: 0;
+
         $event->created_by = Auth::user()->id;
         $event->last_modified_by = Auth::user()->id;
 
@@ -117,7 +119,7 @@ public function create_event(Request $request) {
         // Store a snapshot in the revision table
         $revision = EventRevision::createFromEvent($event);
         $revision->save();
-        
+
         event(new EventCreated($event));
 
         return redirect($event->permalink());
@@ -164,6 +166,9 @@ public function save_event(Request $request, Event $event) {
             $event->{$p} = (request($p) ?: null);
         }
 
+        if(!$event->unlisted)
+            $event->unlisted = 0; // override null from above
+
         $event->sort_date = $event->sort_date();
 
         // Generate a new slug
@@ -230,7 +235,7 @@ public function view_revision(Event $event, EventRevision $revision) {
             'mode' => 'archive',
             'event_id' => $event->id,
         ]);
-    }    
+    }
 
     public function view_revision_diff(Event $event, EventRevision $revision) {
         Gate::authorize('manage-event', $revision);
@@ -246,7 +251,7 @@ public function view_revision_diff(Event $event, EventRevision $revision) {
             'previous' => $previous,
             'event_id' => $event->id,
         ]);
-    }    
+    }
 
     public function upload_event_cover_image(Event $event) {
         Gate::authorize('manage-event', $event);

diff --git a/app/Http/Controllers/ICSController.php b/app/Http/Controllers/ICSController.php
@@ -136,6 +136,7 @@ private function _addEventToCal(&$vCalendar, &$event) {
     public function index($year=false, $month=false) {
 
         $events = Event::orderBy('start_date', 'desc')
+            ->where('unlisted', 0)
             ->get();
 
         $vCalendar = new \Eluceo\iCal\Component\Calendar(parse_url(env('APP_URL'), PHP_URL_HOST));
@@ -157,7 +158,9 @@ public function tag($tag) {
 
         $events = Event::whereHas('tags', function($query) use ($tag){
             $query->where('tag', $tag);
-        })->orderBy('events.start_date', 'desc')->get();
+        })
+        ->where('unlisted', 0)
+        ->orderBy('events.start_date', 'desc')->get();
 
         $vCalendar = new \Eluceo\iCal\Component\Calendar(parse_url(env('APP_URL'), PHP_URL_HOST).' '.$tag);
 

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -27,7 +27,7 @@ public function post() {
         }
 
         $checkboxes = ['enable_webmention_responses', 'enable_ticket_url', 'show_rsvps_in_ics',
-            'auth_hide_login', 'auth_hide_logout'
+            'auth_hide_login', 'auth_hide_logout', 'support_unlisted_events'
         ];
         foreach($checkboxes as $id) {
             Setting::set($id, request($id) ? 1 : 0);

diff --git a/database/migrations/2021_01_27_221005_unlisted_events.php b/database/migrations/2021_01_27_221005_unlisted_events.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UnlistedEvents extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->boolean('unlisted')->default(0);
+        });
+        Schema::table('event_revisions', function (Blueprint $table) {
+            $table->boolean('unlisted')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->dropColumn('unlisted');
+        });
+        Schema::table('event_revisions', function (Blueprint $table) {
+            $table->dropColumn('unlisted');
+        });
+    }
+}
diff --git a/resources/views/edit-event.blade.php b/resources/views/edit-event.blade.php
@@ -265,6 +265,17 @@
         </div>
     </div>
 
+    @if(Setting::value('support_unlisted_events'))
+    <div class="field">
+        <div class="control is-expanded">
+            <label class="checkbox">
+                <input type="checkbox" name="unlisted" value="1" {{ $event->unlisted ? 'checked' : '' }}>
+                Unlisted event (prevents this event from showing on the home page and other feeds)
+            </label>
+        </div>
+    </div>
+    @endif
+
     <div class="field">
         <label class="label">Edit Summary</label>
         <input class="input" type="text" name="edit_summary" value="{{ old('edit_summary') }}" autocomplete="off">

diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
@@ -35,6 +35,14 @@
         <p class="help">When checked, event names in the ics feeds will include the names of people who have RSVP'd to the event.</p>
     </div>
 
+    <div class="field">
+        <label class="label">
+            <input type="checkbox" name="support_unlisted_events" value="1" {{ Setting::value('support_unlisted_events') ? 'checked="checked"' : ''}}>
+            Support Unlisted Events
+        </label>
+        <p class="help">When checked, events can be marked as "unlisted", preventing them from showing up on the home page and all feeds.</p>
+    </div>
+
     <div class="field">
         <label class="label">
             <input type="checkbox" name="enable_webmention_responses" value="1" {{ Setting::value('enable_webmention_responses') ? 'checked="checked"' : ''}}>