<p><b>@gravitystorm</b> commented on this pull request.</p>

<hr>

<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1658#discussion_r146144881">app/controllers/user_controller.rb</a>:</p>
<pre style='color:#555'>> @@ -411,8 +411,8 @@ def make_friend
     if @new_friend
       if request.post?
         friend = Friend.new
-        friend.user_id = current_user.id
-        friend.friend_user_id = @new_friend.id
+        friend.befriender = current_user
+        friend.befriendee = @new_friend
</pre>
<p>Yep, those aren't ideal but they are already in use elsewhere. I'm open to suggestions for changing them. I also intend to rename the <code>Friend</code> model to <code>Friendship</code>, which will make things clearer. But none of that is in this PR.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1658#discussion_r146144881">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLVTdEaKI3Bcv7IdW3Lee3FWPE5F2ks5su7NYgaJpZM4QCGnL">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLVmbTD14cpET_5kdjDXaJuOe1U_fks5su7NYgaJpZM4QCGnL.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/openstreetmap/openstreetmap-website/pull/1658#discussion_r146144881"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"PERSON","message":"@gravitystorm commented on #1658"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1658#discussion_r146144881"}}}</script>