fix dead link to csv export

.gitignore

@@ -4,8 +4,6 @@
 /public/hot
 /public/storage
 /public/reference
-/public/assets/images/references
-/public/assets/images/members
 /storage/*.key
 /vendor
 .env

app/Http/Controllers/DenController.php

@@ -34,6 +34,14 @@ class DenController extends Controller
         ]);
     }
 
+    public function member(Request $request)
+    {
+        $member = Auth::user();
+        return view('back.member', [
+            'handle' => $member->handle,
+            'title'  => "Manage Members"]);
+    }
+
     public function locations(Request $request)
     {
         $member = Auth::user();

app/Http/Controllers/ExportController.php

@@ -60,7 +60,7 @@ class ExportController extends Controller
             if ($rate * 100 >= $percent) {
                 if ($type == 'mastodon') {
                     //comman break teh CSV so just take them out
-                    $comments = str_replace(",", ";", $location->public_comments);
+                    $comments = str_replace(",", ";", $location->description);
 
                     //remove extra white space
                     $comments = str_replace(["\n\r", "\n", "\r"], " ", $comments);

app/Http/Controllers/FrontIndexController.php

@@ -76,19 +76,15 @@ class FrontIndexController extends Controller
         }
 
         if (isset($member->role)) {
-            ($member->role == 0 || $member->role == 1) ? $edit = true : $edit = false;
+            ($member->role == 1 || $member->role == 2) ? $edit = true : $edit = false;
         }
 
-        $links    = explode(',', $location->archive_links);
-        $comments = explode('+', $location->public_comments);
         return view('front.location', [
             'title'         => str_replace(".", " ", $name),
             'location'      => $location,
-            'comments'      => $comments,
             'actions'       => $location->block_count + $location->silence_count,
             'sources_count' => count($sources),
             'images'        => json_decode($location->images),
-            'links'         => $links,
             'updated'       => $location->updated_at->format('Y M d'),
             'edit'          => $edit
         ]);

app/Http/Controllers/LocationController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Services\UpdateService;
 use App\Repositories\LocationRepository;
-use Illuminate\Support\Facades\Auth;
 
 class LocationController extends Controller
 {
@@ -19,51 +18,34 @@ class LocationController extends Controller
         $this->location = $locationRepository;
     }
 
-    //actions
     public function updateLocations()
     {
-        //role check
-        $member = Auth::user();
-        if ($member->role == 0) {
-            $result = $this->update->data();
-            return back()->with(
-                'message',
-                $result
-            );
-        } else {
-            return back()->withErrors('message', 'Nah, you don\'t have permission to do this');
-        }
+        $result = $this->update->data();
+
+        return back()->with(
+            'message',
+            $result
+        );
     }
 
     public function compileLocations()
     {
-        //role check
-        $member = Auth::user();
-        if ($member->role == 0) {
-            $result = $this->update->list();
-            return back()->with(
-                'message',
-                $result
-            );
-        } else {
-            return back()->withErrors('message', 'Nah, you don\'t have permission to do this');
-        }
+        $result = $this->update->list();
+
+        return back()->with(
+            'message',
+            $result
+        );
     }
 
     public function editLocation(Request $request)
     {
-        $token = csrf_token();
-        //role check
-        $member = Auth::user();
-        if ($member->role == 0 || $member->role == 1) {
-            $response = $this->location->editLocation($request);
-            if ($response['status']) {
-                return back()->with('message', $response['message']);
-            } else {
-                return back()->withErrors('message', $response['message']);
-            }
+        $token    = csrf_token();
+        $response = $this->location->editLocation($request);
+        if ($response['status']) {
+            return back()->with('message', $response['message']);
         } else {
-            return back()->withErrors('message', 'Nah, you don\'t have permission to do this');
+            return back()->withErrors('message', $response['message']);
         }
     }
 }

app/Http/Controllers/MemberController.php

@@ -1,154 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Repositories\MemberRepository;
-
-class MemberController extends Controller
-{
-    protected $member;
-
-    public function __construct(
-        MemberRepository $memberRepo
-    ) {
-        $this->member = $memberRepo;
-    }
-
-    public function index(Request $request)
-    {
-        $member = Auth::user();
-        return view('back.member', [
-            'handle'  => $member->handle,
-            'members' => $this->member->getAll(),
-            'mode'    => 'index',
-            'title'   => "Manage Members"]);
-    }
-
-    public function profile(Request $request)
-    {
-        $member = Auth::user();
-        $avi    = '';
-        if ($member->avatar == 'default-member-avatar') {
-            $avi = '/assets/images/global/default-avi.png';
-        } else {
-            $avi = $member->avatar;
-        }
-        return view('back.profile', [
-            'title'    => "Hey, it's you!",
-            'handle'   => $member->handle,
-            'email'    => $member->email,
-            'avatar'   => $avi,
-            'pronouns' => $member->pronoun,
-            'uuid'     => $member->uuid,
-            'role'     => $member->role
-        ]);
-    }
-
-    public function editMember(Request $request, $uuid = 0)
-    {
-        $member = $this->member->get($uuid);
-        $avi    = '';
-        if ($member->avatar == 'default-member-avatar') {
-            $avi = '/assets/images/global/default-avi.png';
-        } else {
-            $avi = $member->avatar;
-        }
-        return view('back.member', [
-            'member' => $member,
-            'avatar' => $avi,
-            'mode'   => 'member-edit',
-            'title'  => "Edit Member Info"]);
-    }
-
-    public function createMember(Request $Request)
-    {
-        return view('back.member', [
-            'mode'  => 'member-create',
-            'title' => "Make a new friend"]);
-    }
-
-    //actions
-    public function profileEdit(Request $request)
-    {
-        $token = csrf_token();
-        //check if logged in member id matches profile request id
-        $member = Auth::user();
-        if ($member->uuid == $request->id) {
-            //validate required fields
-            $valid = $request->validate([
-                'handle' => ['required'],
-                'email'  => ['required'],
-            ]);
-            if ($valid) {
-                $response = $this->member->editProfile($request);
-                if ($response['status'] == true) {
-                    return back()->with('message', $response['message']);
-                } else {
-                    return back()->withErrors([$response['message']]);
-                }
-            } else {
-                return back()->withErrors(['Misssing some required info, homie.']);
-            }
-        } else {
-            return back()->withErrors(['This is not your profile to edit.']);
-        }
-    }
-
-    public function memberEdit(Request $request)
-    {
-        $token = csrf_token();
-        //role check
-        $member = Auth::user();
-        if ($member->role == 0) {
-            $valid = $request->validate([
-                'handle' => ['required'],
-                'email'  => ['required'],
-                'role'   => ['required']
-            ]);
-
-            if ($valid) {
-                $response = $this->member->edit($request);
-                if ($response['status'] == true) {
-                    return back()->with('message', $response['message']);
-                } else {
-                    return back()->withErrors([$response['message']]);
-                }
-            } else {
-                return back()->withErrors(['Misssing some required info, homie.']);
-            }
-        } else {
-            return back()->withErrors(['Nah, you can\'t do this. Wrong permissions.']);
-        }
-    }
-
-    public function memberCreate(Request $request)
-    {
-        $token  = csrf_token();
-        $member = Auth::user();
-        if ($member->role == 0) {
-            $valid = $request->validate([
-                'handle'             => ['required'],
-                'email'              => ['required'],
-                'role'               => ['required'],
-                'pronouns'           => ['required'],
-                'fresh_pass'         => ['required'],
-                'fresh_pass_confirm' => ['required'],
-            ]);
-
-            if ($valid) {
-                $response = $this->member->add($request);
-                if ($response['status'] == true) {
-                    return redirect('/den/member')->with('message', $response['message']);
-                } else {
-                    return back()->withErrors([$response['message']]);
-                }
-            } else {
-                return back()->withErrors(['Misssing some required info, homie.']);
-            }
-        } else {
-            return back()->withErrors(['Nah, you can\'t do this. Wrong permissions.']);
-        }
-    }
-}

app/Models/Location.php

@@ -24,7 +24,7 @@ class Location extends Model
         "uuid",
         "name",
         "url",
-        "public_comments",
+        "description",
         "images",
         "active",
         "rating",
@@ -35,7 +35,6 @@ class Location extends Model
         "created_at",
         "updated_at",
         "actions_count",
-        "archive_links",
-        "notes",
+        "archive_links"
     ];
 }

app/Models/Member.php

@@ -9,20 +9,6 @@ class Member extends Authenticatable
 {
     use HasFactory;
 
-    public $timestamps    = false;
-    protected $table      = "member";
-    protected $primaryKey = 'id';
-    public $incrementing  = true;
-    protected $fillable   = [
-        "uuid",
-        "handle",
-        "email",
-        "password",
-        "active",
-        "role",
-        "avatar",
-        "pronoun",
-        "created_at",
-        "last_login"
-    ];
+    protected $table    = "member";
+    protected $fillable = ["uuid", "handle", "email", "password", "active", "role", "avatar", "pronoun", "gender"];
 }

app/Providers/AppServiceProvider.php

@@ -5,12 +5,10 @@ namespace App\Providers;
 use Illuminate\Support\ServiceProvider;
 use App\Repositories\LocationRepository;
 use App\Repositories\SourceRepository;
-use App\Repositories\MemberRepository;
 use App\Services\UpdateService;
 use App\Services\MaintenanceService;
 use App\Models\Location;
 use App\Models\Source;
-use App\Models\Member;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -27,10 +25,6 @@ class AppServiceProvider extends ServiceProvider
             return new SourceRepository(new Source());
         });
 
-        $this->app->bind(MemberRepository::class, function ($app) {
-            return new MemberRepository(new Member());
-        });
-
         $this->app->bind(UpdateService::class, function ($app) {
             return new UpdateService(
                 new LocationRepository(new Location()),

app/Repositories/LocationRepository.php

@@ -56,34 +56,24 @@ class LocationRepository
 
     public function editLocation($request)
     {
-        $location   = $this->getLocation($request->id);
-        $publicPath = '../public/';
-        $refPath    = 'assets/images/references/' . $location->uuid;
-        $images     = [];
+        $location = $this->getLocation($request->id);
+        $images   = [];
         if ($request->hasfile("references")) {
             foreach ($request->references as $file) {
-                if (!is_dir($publicPath . $refPath)) {
-                    mkdir($publicPath . $refPath, 0755, true);
-                }
-                $filename = urlencode($file->getClientOriginalName());
-                $file->move($publicPath . $refPath, $filename);
-                //$path = $file->store('reference');
-                array_push($images, ["path" => '/' . $refPath . '/' . $filename]);
+                $path = $file->store('reference');
+                array_push($images, ["path" => $path]);
             }
         }
-        if (!empty($images)) {
-            $request->merge(['images' => json_encode($images)]);
-            $location->images = json_encode($images);
-        }
-
+        $request->merge(['images' => json_encode($images)]);
         $location->name          = $request->name;
-        $location->notes         = $request->notes;
+        $location->description   = $request->description;
         $location->archive_links = $request->archive_links;
+        $location->images        = json_encode($images);
 
         $result = [];
 
         if ($location->save()) {
-            return ['status' => true, 'message' => "Location Editited" . $request->hasfile("references")];
+            return ['status' => true, 'message' => "Location Editited -IMG- " . $request->hasfile("references")];
         } else {
             return ['status' => false, 'message' => "Location Not Editited"];
         }

app/Repositories/MemberRepository.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Repositories;
-
-use App\Models\Member;
-use Illuminate\Support\Facades\Hash;
-use Ramsey\Uuid\Uuid;
-use Carbon\Carbon;
-
-class MemberRepository
-{
-    protected $model;
-
-    public function __construct(Member $model)
-    {
-        $this->model = $model;
-    }
-
-    public function getAll()
-    {
-        return $this->model::all();
-    }
-
-    public function get($uuid)
-    {
-        return $this->model::where("uuid", $uuid)->first();
-    }
-
-    public function edit($request)
-    {
-        //get member to edit
-        $member = $this->get($request->id);
-
-        //save new avi if available
-        $publicPath = '../public/';
-        $refPath    = 'assets/images/members/' . $member->uuid;
-        if ($request->hasfile("fresh_avi")) {
-            $file = $request->fresh_avi;
-            if (!is_dir($publicPath . $refPath)) {
-                mkdir($publicPath . $refPath, 0755, true);
-            }
-            $filename = urlencode($file->getClientOriginalName());
-            $file->move($publicPath . $refPath, $filename);
-            $freshAvi       = '/' . $refPath . '/' . $filename;
-            $member->avatar = $freshAvi;
-        }
-
-        $member->handle  = $request->handle;
-        $member->email   = $request->email;
-        $member->pronoun = $request->pronouns;
-        $member->role    = $request->role;
-        $member->active  = $request->status;
-
-        if ($member->save()) {
-            return ['status' => true, 'message' => "Member Editited"];
-        } else {
-            return ['status' => false, 'message' => "Member Not Editited"];
-        }
-    }
-
-    public function add($request)
-    {
-        $password = [];
-        if ($request->fresh_pass === $request->fresh_pass_confirm) {
-            $password = Hash::make($request->fresh_pass);
-        } else {
-            return ['status' => false, 'message' => "Passwords Do Not Match"];
-        }
-
-        $newFriend = $this->model::create([
-            'uuid'       => Uuid::uuid4(),
-            'avatar'     => 'default-member-avatar',
-            'handle'     => $request->handle,
-            'email'      => $request->email,
-            'pronoun'    => $request->pronouns,
-            'role'       => $request->role,
-            'active'     => $request->status,
-            'password'   => $password,
-            'created_at' => Carbon::now(),
-            'last_login' => Carbon::now(),
-        ]);
-
-        if ($newFriend) {
-            return ['status' => true, 'message' => "New Friend Made!"];
-        } else {
-            return ['status' => false, 'message' => "Uh oh, New Friend Delay!"];
-        }
-    }
-
-    public function editProfile($request)
-    {
-        //get member to edit
-        $member = $this->get($request->id);
-
-        //save new avi if available
-        $publicPath = '../public/';
-        $refPath    = 'assets/images/members/' . $member->uuid;
-        if ($request->hasfile("fresh_avi")) {
-            $file = $request->fresh_avi;
-            if (!is_dir($publicPath . $refPath)) {
-                mkdir($publicPath . $refPath, 0755, true);
-            }
-            $filename = urlencode($file->getClientOriginalName());
-            $file->move($publicPath . $refPath, $filename);
-            $freshAvi       = '/' . $refPath . '/' . $filename;
-            $member->avatar = $freshAvi;
-        }
-        //changing password
-        if (isset($request->fresh_pass) && $request->fresh_pass !== '') {
-            if ($request->fresh_pass === $request->fresh_pass_confirm) {
-                $member->password = Hash::make($request->fresh_pass);
-            } else {
-                return ['status' => false, 'message' => "Passwords Do Not Match"];
-            }
-        }
-
-        $member->handle  = $request->handle;
-        $member->email   = $request->email;
-        $member->pronoun = $request->pronouns;
-
-        if ($member->save()) {
-            return ['status' => true, 'message' => "Profile Editited"];
-        } else {
-            return ['status' => false, 'message' => "Profile Not Editited"];
-        }
-    }
-}

app/Repositories/SourceRepository.php

@@ -9,16 +9,10 @@ use GuzzleHttp\Exception\ConnectException;
 class SourceRepository
 {
     protected $source;
-    protected $missing;
-    protected $updated;
-    protected $sources;
 
     public function __construct(Source $source)
     {
-        $this->source  = $source;
-        $this->missing = [];
-        $this->updated = [];
-        $this->sources = $source::where("active", true)->get();
+        $this->source = $source;
     }
 
     public function getActive()
@@ -26,80 +20,51 @@ class SourceRepository
         return $this->source::where("active", true)->get();
     }
 
-    public function updateSourceData($index = 0)
+    public function updateSourceData()
     {
+        $sources = $this->getActive();
+        $missing = [];
+        $checked = [];
         //checks all the sources to refresh data
-        $count = count($this->sources);
-        if ($count == 0) {
-            return [
-                'checked'    => $this->updated,
-                'notchecked' => $this->missing,
-                'count'      => $count,
-                'updated'    => 'false',
-            ];
-        } else {
-            //check index
-            if ($index <= $count - 1) {
-                $source = $this->sources[$index];
-                $result = $this->getMastoBlocklist($source);
-                if (count($result) > 0) {
-                    $source->list_data    = json_encode($result);
-                    $source->last_updated = Carbon::now();
-                    $source->save();
-                    array_push($this->updated, ['source' => $source->url]);
-                    $index++;
-                    $result = $this->updateSourceData($index);
+        foreach ($sources as $source) {
+            $result = [];
+            if ($source['type'] == 'mastodon') {
+                if ($source['token'] == null) {
+                    try {
+                        $result = \Mastodon::domain('https://' . $source['url'])
+                            ->get('/instance/domain_blocks');
+                        array_push($checked, ['source' => $source->url]);
+                    } catch (ConnectException $e) {
+                        array_push($missing, ['source' => $source->url]);
+                    }
                 } else {
-                    //if empty run the same index again
-                    array_push($this->missing, ['source' => $source->url]);
-                    $result = $this->updateSourceData($index);
+                    try {
+                        $result = \Mastodon::domain('https://' . $source['url'])
+                            ->token($source['token'])
+                            ->get('/instance/domain_blocks');
+                        array_push($checked, ['source' => $source->url]);
+                    } catch (ConnectException $e) {
+                    }
+                }
+            } elseif ($source['type'] == 'custom' && $source['format'] == 'csv') {
+                try {
+                    $denylist = array_map('str_getcsv', file('https://' . $source['url']));
+                    foreach ($denylist as $item) {
+                        array_push($result, [
+                            'domain'   => $item[0],
+                            'severity' => $item[1],
+                            'comment'  => $item[2]]);
+                    }
+                    array_push($checked, ['source' => $source->url]);
+                } catch (Exception $e) {
+                    array_push($missing, ['source' => $source->url]);
                 }
-            } else {
-                //continue
             }
-            return [
-                'checked'    => $this->updated,
-                'notchecked' => $this->missing,
-                'count'      => $count,
-                'updated'    => 'true',
-            ];
-        }
-    }
 
-    private function getMastoBlocklist($source)
-    {
-        $result = [];
-        if ($source['type'] == 'mastodon') {
-            if ($source['token'] == null) {
-                try {
-                    $result = \Mastodon::domain('https://' . $source['url'])
-                        ->get('/instance/domain_blocks');
-                } catch (ConnectException $e) {
-                    //TODO: Logo Errors
-                }
-            } else {
-                try {
-                    $result = \Mastodon::domain('https://' . $source['url'])
-                        ->token($source['token'])
-                        ->get('/instance/domain_blocks');
-                } catch (ConnectException $e) {
-                    //TODO: Logo Errors
-                }
-            }
-        } elseif ($source['type'] == 'custom' && $source['format'] == 'csv') {
-            try {
-                $denylist = array_map('str_getcsv', file('https://' . $source['url']));
-                foreach ($denylist as $item) {
-                    array_push($result, [
-                        'domain'   => $item[0],
-                        'severity' => $item[1],
-                        'comment'  => $item[2]]);
-                }
-                array_push($checked, ['source' => $source->url]);
-            } catch (Exception $e) {
-                array_push($missing, ['source' => $source->url]);
-            }
+            $source->list_data    = json_encode($result);
+            $source->last_updated = Carbon::now();
+            $source->save();
         }
-        return $result;
+        return ['checked' => $checked, 'notchecked' => $missing];
     }
 }

app/Services/UpdateService.php

@@ -23,11 +23,8 @@ class UpdateService
     public function data()
     {
         $response = $this->source->updateSourceData();
-        if ($response['updated'] == 'true') {
-            return count($response['checked']) . ' SOURCES UPDATED';
-        } else {
-            return 'NO SOURCES PRESENT';
-        }
+        return count($response['checked']) . ' SOURCES UPDATED - ' .
+            count($response['notchecked']) . ' SOURCES NOT CHECKED';
     }
 
     public function list()
@@ -36,15 +33,14 @@ class UpdateService
         $fresh      = 0;
         $unified    = [];
 
-        $sources   = $this->source->getActive();
-        $locations = $this->location->getActiveLocations();
+        $sources = $this->source->getActive();
 
         foreach ($sources as $source) {
             //$listData = json_decode();
             foreach (json_decode($source->list_data) as $item) {
                 $index = array_search($item->domain, array_column($unified, 'url'));
                 if ($index) {
-                    //if there is a match, update the count and comment
+                    //if there is a match, update the count
                     if ($item->severity == "suspend" || $item->severity == "defederate") {
                         ++$unified[$index]['block_count'];
                         array_push($unified[$index]['block_vote'], $source->url);
@@ -52,9 +48,6 @@ class UpdateService
                         ++$unified[$index]['silence_count'];
                         array_push($unified[$index]['silence_vote'], $source->url);
                     }
-                    if (!is_null($item->comment) && $item->comment != ' ' && $item->comment != '') {
-                        $unified[$index]['comment'] = $item->comment . '+' . $unified[$index]['comment'];
-                    }
                 } else {
                     $silence      = 0;
                     $suspend      = 0;
@@ -81,12 +74,6 @@ class UpdateService
             }
         }
 
-        //clear out all previous descriptions
-        foreach ($locations as $loc) {
-            $loc->public_comments = ' ';
-            $loc->save();
-        }
-
         foreach ($unified as $item) {
             $location = $this->location->getLocation($item['url']);
             if ($location) {
@@ -99,12 +86,6 @@ class UpdateService
                 $location->silence_count = $item['silence_count'];
                 $location->silence_vote  = [];
                 $location->silence_vote  = $item['silence_vote'];
-                //clear descriptions
-                if (!is_null($item['comment']) || !$item['comment'] != " ") {
-                    $location->public_comments = $item['comment'];
-                } else {
-                    $location->public_comments = 'Comments Pending';
-                }
 
                 $location->actions_count = $item['block_count'] + $item['silence_count'];
 
@@ -131,20 +112,20 @@ class UpdateService
                 }
 
                 $new = Location::create([
-                    'uuid'            => Uuid::uuid4(),
-                    'name'            => $item['url'],
-                    'url'             => $item['url'],
-                    'public_comments' => ($item['comment'] != null) ? $item['comment'] : "comments pending",
-                    'active'          => $status,
-                    'rating'          => $rating,
-                    'added_by'        => 1,
-                    'tags'            => 'poor moderation, hate speech',
-                    'images'          => json_encode($images),
-                    'block_count'     => $item['block_count'],
-                    'block_vote'      => $item['block_vote'],
-                    'silence_count'   => $item['silence_count'],
-                    'silence_vote'    => $item['silence_vote'],
-                    'actions_cont'    => $item['block_count'] + $item['silence_count']
+                    'uuid'          => Uuid::uuid4(),
+                    'name'          => $item['url'],
+                    'url'           => $item['url'],
+                    'description'   => ($item['comment'] != null) ? $item['comment'] : "no description",
+                    'active'        => $status,
+                    'rating'        => $rating,
+                    'added_by'      => 1,
+                    'tags'          => 'poor moderation, hate speech',
+                    'images'        => json_encode($images),
+                    'block_count'   => $item['block_count'],
+                    'block_vote'    => $item['block_vote'],
+                    'silence_count' => $item['silence_count'],
+                    'silence_vote'  => $item['silence_vote'],
+                    'actions_cont'  => $item['block_count'] + $item['silence_count']
                 ]);
             }
         }

composer.json

@@ -1,33 +1,16 @@
 {
-    "name": "project/thebadspace",
-    "type": "moderation",
-    "description": "A tool for improving independent social media curation",
-    "version": "0.7-alpha",
-    "keywords": [
-        "thebadspace",
-        "tbs",
-        "activty-pub",
-        "laravel",
-        "framework",
-        "moderation",
-        "safety",
-        "curation",
-        "tooling",
-        "fediverse"
-    ],
-    "license": [
-       "GPL-3.0-only"
-    ],
-    "authors": [
-        {
-            "name": "Ro",
-            "homepage": "https://roiskinda.cool"
-        }
-    ],
-    "support": {
-        "source": "https://koodu.h-i.works/projects/thebadspace",
-        "wiki": "https://koodu.h-i.works/projects/thebadspace/wiki/?action=_pages",
-        "issues": "https://koodu.h-i.works/projects/thebadspace/issues"
+    "name": "laravel/laravel",
+    "type": "project",
+    "description": "The skeleton application for the Laravel framework.",
+    "keywords": ["laravel", "framework"],
+    "license": "MIT",
+    "require": {
+        "php": "^8.2",
+        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^11.0",
+        "laravel/sanctum": "^4.0",
+        "laravel/tinker": "^2.8",
+        "revolution/laravel-mastodon-api": "^3.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
@@ -67,9 +50,7 @@
     },
     "extra": {
         "laravel": {
-            "dont-discover": [
-
-            ]
+            "dont-discover": []
         }
     },
     "config": {

public/assets/css/global/forms.css

@@ -36,7 +36,6 @@ input[type="submit"] {
   border: 0;
   transition: all 0.3s linear;
   height: 35px;
-  margin-top: 15px;
 }
 
 select {
@@ -46,5 +45,4 @@ select {
   appearance: none;
   color: var(--primary);
   background: var(--secondary);
-  height: 35px;
 }

public/assets/css/global/frame.css

@@ -199,7 +199,9 @@ footer {
   padding: 10px;
   gap: 10px;
   height: auto;
-  width: auto;
+  width: 80%;
+  margin: 20px auto;
+  max-width: 1000px;
   position: relative;
 }
 
@@ -211,15 +213,6 @@ footer > div:nth-child(2) {
   text-align: right;
 }
 
-/*
-    member stuff
- */
-
-.your-avatar {
-  width: 250px;
-  border-radius: 5px;
-}
-
 /*
     responsive
  */

resources/views/back/location.blade.php

@@ -11,10 +11,8 @@
           @csrf
           <label>Edit Location Name</label><br>
           <input type="text" name="name" value="{{$location->name}}" /><br>
-
-          <label>Edit Location Notes</label><br>
-          <textarea name="notes">{{$location->notes}}</textarea><br>
-
+          <label>Edit Location Comments</label><br>
+          <textarea name="description">{{$location->description}}</textarea><br>
           <label>Edit Reference Links (comma seperated)</label><br>
           <textarea name="archive_links">{{$location->archive_links}}</textarea><br>
           <label>Edit Reference Images</label><br>
@@ -26,7 +24,7 @@
         <h3>Images</h3>
         @if($images != null)
           @foreach($images as $image)
-            <a href="{{$image->path}}" class="location-image" style="background: url({{$image->path}}) no-repeat center center / cover #fc6399" />
+            <a href="/{{$image->path}}" class="location-image" style="background: url(/{{$image->path}}) no-repeat center center / cover #fc6399" />
             </a>
           @endforeach
         @endif

resources/views/back/member.blade.php

@@ -2,38 +2,12 @@
 
 @section('title', 'Den | Member Admin')
 
-  @php
-    if($mode == 'member-create')
-    {
-      $action_url = '/den/member/create';
-    }else{
-      $action_url = '/den/member/edit';
-    }
-  @endphp
   @section('main-content')
     <section>
       <article>
-        @switch($mode)
-          @case('member-edit') 
-          <h2>Edit Info for {{$member->handle}}</h2>
-          @include('forms.member-edit') 
-          <br />
-          @break
-
-          @case('member-create') 
-          <h2>New Member Info</h2>
-          @include('forms.member-edit') 
-          <br />
-          @break
-
-          @default
-            <h2>Member Listing </h2>
-            @foreach($members as $member)
-              <a href="/den/member/{{$member->uuid}}">{{$member->handle}}</a><br />
-            @endforeach
-            <h2>Add Member </h2>
-            <a href="/den/member/edit/create">Make a new friend</a><br />
-          @endswitch
+        <h2>Member Listing </h2>
+        <a href="/den/admin/update">UPDATE LOCATIONS</a><br />
+        <a href="/den/admin/compile">COMPILE LOCATIONS</a>
       </article>
     </section>
   @endsection

resources/views/back/profile.blade.php

@@ -1,13 +0,0 @@
-@extends('frame') 
-
-@section('title', 'Den | Your Profile')
-
-  @section('main-content')
-    <section>
-      <article>
-        <h2>Edit Profile Deets </h2>
-        @include('forms.profile-edit') 
-      </article>
-    </section>
-    <br />
-  @endsection

resources/views/back/start.blade.php

@@ -8,8 +8,8 @@
       <article>
         <h2>Hey {{$handle}} </h2>
         <a href="/den/you">Edit Your Account</a><br />
-        @if($role==0)
-          <a href="/den/locations">Manage Locations</a><br />
+        <a href="/den/locations">Manage Locations</a><br />
+        @if($role==1)
           <a href="/den/member">Manage Members</a><br />
         @endif
       </article>

resources/views/forms/member-edit.blade.php

@@ -1,61 +0,0 @@
-<form action="{{$action_url}}" method="post" enctype="multipart/form-data">
-  <div>
-    @php
-    isset($avatar) ? $avi = $avatar : $avi = '';
-    @endphp
-    <img class="your-avatar" src='{{$avi}}'>
-    <br />
-    <label>Handle</label><br />
-    @php
-    isset($member->handle) ? $handle = $member->handle : $handle = '';
-    @endphp
-    <input type="text" name="handle" value="{{$handle}}" />
-    <br />
-    @php
-    isset($member->email) ? $email = $member->email : $email = '';
-    @endphp
-    <label>Email</label><br />
-    <input type="text" name="email" value="{{$email}}" />
-    <br />
-    @php
-    isset($member->pronoun) ? $pronoun = $member->pronoun : $pronoun = '';
-    @endphp
-    <label>Pronouns</label><br />
-    <input type="text" name="pronouns" value="{{$pronoun}}" />
-    <br />
-    @php
-    isset($member->role) ? $role = $member->role : $role = 2;
-    @endphp
-    <label>Role</label><br />
-    <input type="text" name="role" value="{{$role}}" />
-    <br />
-    @if($mode == 'member-create')
-      <label>Fresh Password</label><br />
-      <input type="password" id="fresh_pass" name="fresh_pass" value="" />
-      <br />
-      <label>Confirm Fresh Password</label><br />
-      <input type="password" id="fresh_pass_confirm" name="fresh_pass_confirm" value="" />
-      <br />
-    @endif
-    @php
-    isset($member->active) ? $status = $member->active : $status = false;
-    @endphp
-    <label>Status</label><br />
-    <select name="status">
-      @if($status)
-        <option value="true" selected>Active</option>
-        <option value="false">Not Active</option>
-      @else
-        <option value="true">Active</option>
-        <option value="false" selected>Not Active</option>
-      @endif
-    </select>
-    <br />
-  </div>
-  @csrf
-  @php
-  isset($member->uuid) ? $uuid = $member->uuid : $uuid = 0;
-  @endphp
-  <input type="hidden" name="id" value="{{$uuid}}" />
-  <input type="submit" value="Edit Member" name="submit_button">
-</form>

resources/views/forms/profile-edit.blade.php

@@ -1,30 +0,0 @@
-<form action="/den/profile/edit" method="post" enctype="multipart/form-data">
-  <div>
-    <img class="your-avatar" src='{{$avatar}}'>
-    <br />
-    <label>New Avatar</label><br />
-    <input type="file" id="fresh_avi" name="fresh_avi" />
-    <br />
-    <label>Handle</label><br />
-    <input type="text" name="handle" value="{{$handle}}" />
-    <br />
-    <label>Email</label><br />
-    <input type="text" name="email" value="{{$email}}" />
-    <br />
-    <label>Pronouns</label><br />
-    <input type="text" name="pronouns" value="{{$pronouns}}" />
-    <br />
-    <h2>Change Password</h2>
-    <label>Fresh Password</label><br />
-    <input type="password" id="fresh_pass" name="fresh_pass" value="" />
-    <br />
-    <label>Confirm Fresh Password</label><br />
-    <input type="password" id="fresh_pass_confirm" name="fresh_pass_confirm" value="" />
-    <br />
-
-
-  </div>
-  @csrf
-  <input type="hidden" name="id" value="{{$uuid}}" />
-  <input type="submit" value="Edit Profile" name="submit_button">
-</form>

resources/views/frame.blade.php

@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8">
-  <meta name="theme-color" content="#c3639e" />
+  <meta name="theme-color" content="#d66365" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>
     @yield('title') 
@@ -94,7 +94,7 @@
       an <a href="https://h-i.works">h.i.</a> project
     </div>
     <div>
-      a0.7
+      a0.6
     </div>
   </footer>
 </body>

resources/views/front/about.blade.php

@@ -59,7 +59,7 @@
         <h3>CSV Exports</h3>
         For a list of the current locations being tracked, click on one of the links below to download a dynamically generated CSV file that can be consumed as a blocklist. More formats will be added over time.
         <br />
-        <a href="/exports/mastodon">For Mastodon</a>
+        <a href="/exports">For Mastodon</a>
         <h3>API</h3>
         The Bad Space has a public api that can be used to search the database programatically and return results in the JSON format. The API can be accsess at<br />
         <code>https://thebad.space/api/v1/search</code>

resources/views/front/index.blade.php

@@ -38,8 +38,27 @@
     @endisset
     <section class="index-meta">
       <article>
+        <h2>Recent Updates</h2>
+        @foreach($recent as $item)
+          <a class="list-link" role="listitem" href="/location/{{$item->uuid}}">
+            @php
+              $rating = floor(($item->actions_count / $sources)*100);
+            @endphp
+            <span class="item-rating">{{$rating}}%</span>
+            <label class="item-name">{{$item->name}}</label>
+            <div class="item-silence">
+              <img class="item-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
+              {{$item->silence_count}}
+            </div>
+            <div class="item-block">
+              <img class="item-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
+              {{$item->block_count}}
+            </div>
+          </a>
+        @endforeach
+        <h2>Info</h2>
         <div class="index-meta">
-          <label>Active Locations Tracked</label>
+          <label>Locations Tracked</label>
           <label>{{$count}}</label>
           <label>Total Sources</label>
           <label>{{$sources}}</label>

resources/views/front/location.blade.php

@@ -6,19 +6,13 @@
     @parent
     <section>
       <article>
-        <h2>Public Comments</h2>
-        @foreach($comments as $comment)
-          @if($comment != " " && $comment != '')
-            {{trim($comment)}}<br /><br />
-          @endif
-        @endforeach
-        <h2>Notes</h2>
-        {{$location->notes}}
+        <h2>Description</h2>
+        {{$location->description}}<br />
         <h2>References</h2>
         <h3>Images</h3>
         @if($images != null)
           @foreach($images as $image)
-            <a href="{{$image->path}}" class="location-image" style="background: url({{$image->path}}) no-repeat center center / cover #fc6399" />
+            <a href="/{{$image->path}}" class="location-image" style="background: url(/{{$image->path}}) no-repeat center center / cover #fc6399" />
             </a>
           @endforeach
         @endif
@@ -27,9 +21,6 @@
           $rating = floor(($action / $sources_count)*100);
         @endphp
         <h3>Links</h3>
-        @foreach($links as $link)
-          <a href="{{$link}}">{{$link}}</a><br />
-        @endforeach
         <div class="location-rating">
           <div>
             <img class="rating-icon" src="/assets/images/global/heat.svg" title="heat-rating" />
@@ -56,11 +47,8 @@
 
         <br />
         Heat Rating is the percentage of <a href="/about#how">Current Sources</a> that have taken action against an instance. The higher the number of Sources that have silenced and/or suspended an instance, the higher the Heat Rating.
-        <br />
-        <br />UPDATED : {{$updated}}
-        <br />
-        <br />
 
+        <br />UPDATED : {{$updated}}
       </article>
     </section>
   @endsection

routes/web.php

@@ -5,7 +5,6 @@ use App\Http\Controllers\FrontIndexController;
 use App\Http\Controllers\AuthController;
 use App\Http\Controllers\DenController;
 use App\Http\Controllers\LocationController;
-use App\Http\Controllers\MemberController;
 use App\Http\Controllers\ExportController;
 use App\Http\Controllers\AppealController;
 
@@ -41,6 +40,7 @@ Route::get("/logout", [AuthController::class, 'leave']);
 //back
 Route::group(['prefix' => 'den', 'middleware' => 'member.check'], function () {
     Route::get("/", [DenController::class, 'start']);
+    Route::get("/member", [DenController::class, 'member']);
     Route::get("/listings/{pageNum}", [DenController::class, 'location']);
     Route::get("/location/edit/{uuid}", [DenController::class, 'locationEdit']);
     Route::get("/locations", [DenController::class, 'locations']);
@@ -48,13 +48,4 @@ Route::group(['prefix' => 'den', 'middleware' => 'member.check'], function () {
     Route::post("/locations/edit", [LocationController::class, 'editLocation']);
     Route::get("/admin/update", [LocationController::class, 'updateLocations']);
     Route::get("/admin/compile", [LocationController::class, 'compileLocations']);
-    //member stuff
-    Route::get("/you", [MemberController::class, 'profile']);
-    Route::get("/member", [MemberController::class, 'index']);
-    Route::get("/member/{uuid}", [MemberController::class, 'editMember']);
-    Route::get("/member/edit/create", [MemberController::class, 'createMember']);
-    //actions
-    Route::post("/profile/edit", [MemberController::class, 'profileEdit']);
-    Route::post("/member/edit", [MemberController::class, 'memberEdit']);
-    Route::post("/member/create", [MemberController::class, 'memberCreate']);
 });