refactor code and method names in friendship model, fix bug where a user requesting friendship can accept the friendship