Clean up some relation stuff

src/Api/Serializers/BaseSerializer.php

@@ -55,7 +55,7 @@ abstract class BaseSerializer extends SerializerAbstract
                 $data = $relation($model, $include);
             } else {
                 if ($include) {
-                    $data = $model->getRelation($relation);
+                    $data = $model->$relation;
                 } elseif ($many) {
                     $relationIds = $relation.'_ids';
                     $data = isset($model->$relationIds) ? $model->$relationIds : $model->$relation()->lists('id');

src/Api/Serializers/DiscussionSerializer.php

@@ -13,7 +13,7 @@ class DiscussionSerializer extends DiscussionBasicSerializer
         $attributes = parent::attributes($discussion);
 
         $user = $this->actor->getUser();
-        $state = $discussion->stateFor($user);
+        $state = $discussion->state;
 
         $attributes += [
             'commentsCount'     => (int) $discussion->comments_count,

src/Core/Support/Locked.php

@@ -34,6 +34,8 @@ trait Locked
                 return $can;
             }
         }
+
+        return false;
     }
 
     /**